From 4c47b0f0cdb2b32abb8a7e11d2dfe01ff6897338 Mon Sep 17 00:00:00 2001
From: Maximilian Schleiss <maxschleiss@solnet.ch>
Date: Mon, 20 Oct 2008 20:41:42 +0000
Subject: [PATCH] Translation updates for many packages in many languages, is
 this message too vague

(Old svn revision: 28336)
---
 po/ChangeLog |   7 +
 po/ca.po     | 415 ++++++++++++-------------------
 po/de.po     | 106 ++++----
 po/fr.po     | 208 +++-------------
 po/ja.po     | 688 +++++++++++++--------------------------------------
 5 files changed, 421 insertions(+), 1003 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 65adcdae5..8f14fe3e3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-20  Maximilian Schleiss <maximilian@xfce.org>
+
+	* ca.po: Catalan translation update (Carles Muñoz Gorriz)
+	* de.po: German translation update (Fabian Nowak)
+	* fr.po: French translation update
+	* ja.po: Japanese translation update (Masato Hashimoto)
+
 2008-10-20  Jari Rahkonen <jari.rahkonen@pp1.inet.fi>
 
 	* fi.po: Update Finnish translation
diff --git a/po/ca.po b/po/ca.po
index f6e8d4570..1effb3cf6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,20 +3,20 @@
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
 #
-# Carles Muñoz Gorriz <carlesmu@internautas.org>, 2003-2004, 2006
+# Carles Muñoz Gorriz <carlesmu@internautas.org>, 2003-2004, 2006, 2008
 # Pau Ruŀlan Ferragut <paurullan@bulma.net> 2005-07
 msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-18 22:05+0100\n"
-"PO-Revision-Date: 2007-09-30 09:59+0200\n"
-"Last-Translator: Pau Ruŀlan Ferragut <paurullan@bulma.net>\n"
+"PO-Revision-Date: 2008-10-19 19:52+0100\n"
+"Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
 "Language-Team: Catalan <xfce-i18n@xfce.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -26,10 +26,12 @@ msgid ""
 "This window might be busy and is not responding.\n"
 "Do you want to terminate the application?"
 msgstr ""
+"Aquesta finestra pot estar ocupada i no respon.\n"
+"Voleu acabar aquesta aplicació?"
 
 #: ../helper-dialog/helper-dialog.c:89
 msgid "Warning"
-msgstr ""
+msgstr "Advertència"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:182
@@ -47,14 +49,12 @@ msgid "Ma_ximize"
 msgstr "Ma_ximitza"
 
 #: ../src/menu.c:44
-#, fuzzy
 msgid "(Un)Ma_ximize"
-msgstr "Ma_ximitza"
+msgstr "(Des)Ma_ximitza"
 
 #: ../src/menu.c:45
-#, fuzzy
 msgid "Mi_nimize"
-msgstr "Ma_ximitza"
+msgstr "Mi_nimitza"
 
 #: ../src/menu.c:46
 msgid "Hide _all others"
@@ -66,29 +66,27 @@ msgstr "_Mostra"
 
 #: ../src/menu.c:48
 msgid "_Move"
-msgstr ""
+msgstr "_Mou"
 
 #: ../src/menu.c:49
 msgid "_Resize"
-msgstr ""
+msgstr "_Redimensiona"
 
 #: ../src/menu.c:51
 msgid "_Shade"
 msgstr "_Enrotlla"
 
 #: ../src/menu.c:52
-#, fuzzy
 msgid "(Un)_Shade"
-msgstr "Des_enrotlla"
+msgstr "(Des)_Enrotlla"
 
 #: ../src/menu.c:53
 msgid "S_tick"
 msgstr "_Omnipresent"
 
 #: ../src/menu.c:54
-#, fuzzy
 msgid "(Un)S_tick"
-msgstr "No _omnipresent"
+msgstr "(No)_Omnipresent"
 
 #: ../src/menu.c:55
 msgid "Context _help"
@@ -96,25 +94,23 @@ msgstr "A_juda contextual"
 
 #: ../src/menu.c:57
 msgid "Above"
-msgstr ""
+msgstr "A sobre"
 
 #: ../src/menu.c:58
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #: ../src/menu.c:59
-#, fuzzy
 msgid "Below"
-msgstr "Lent"
+msgstr "Sota"
 
 #: ../src/menu.c:60
-#, fuzzy
 msgid "_Fullscreen"
-msgstr "Commuta a pantalla completa"
+msgstr "_Pantalla sencera"
 
 #: ../src/menu.c:61
 msgid "(Un)_Fullscreen"
-msgstr ""
+msgstr "(No)_Pantalla completa"
 
 #: ../src/menu.c:62
 msgid "Send to..."
@@ -139,12 +135,12 @@ msgstr "Reinicia"
 #: ../src/menu.c:186
 #, c-format
 msgid "Workspace %i (%s)"
-msgstr "Àrea de treball %i (%s)"
+msgstr "Espai de treball %i (%s)"
 
 #: ../src/menu.c:190
 #, c-format
 msgid "Workspace %i"
-msgstr "Àrea de treball %i"
+msgstr "Espai de treball %i"
 
 #: ../src/menu.c:426
 #, c-format
@@ -160,6 +156,7 @@ msgstr "%s: no s'ha pogut situar el color %s\n"
 #, c-format
 msgid "%s: Cannot allocate color: GValue for color is not of type STRING"
 msgstr ""
+"%s: No es pot posar el color: «GValue» del color no és del tipus «STRING»"
 
 #: ../src/settings.c:285
 #, c-format
@@ -169,23 +166,22 @@ msgstr "%s: no s'ha pogut analitzar el color %s\n"
 #: ../src/settings.c:287
 #, c-format
 msgid "%s: Cannot parse color: GValue for color is not of type STRING"
-msgstr ""
+msgstr "%s: No pot analitzar el calor: «Gvalue» no és de tipus «STRING»"
 
 #: ../src/terminate.c:74
 #, c-format
 msgid "Error reading data from child process: %s\n"
-msgstr ""
+msgstr "Error al llegir dades del procés fill: %s\n"
 
 #: ../src/terminate.c:122
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
-msgstr ""
+msgstr "No s'ha pogut crear la finestra d'ajuda: %s\n"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
 msgid "Configure window behavior"
-msgstr "Canceŀla l’operació de finestra"
+msgstr "Configura el comportament de la finestra"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
@@ -202,9 +198,8 @@ msgstr "Paràmetres del gestor de finestres d'Xfce 4"
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:4
-#, fuzzy
 msgid "Advanced window manager settings"
-msgstr "Paràmetres del gestor de finestres d'Xfce 4"
+msgstr "Paràmetres avançats del gestor de finestres"
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
@@ -217,9 +212,8 @@ msgstr "Ajustaments avançats del gestor de finestres d'Xfce 4"
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
-#, fuzzy
 msgid "Set number and names of workspaces"
-msgstr "Nombre d'espais de treball:"
+msgstr "Fixa el nombre i noms dels espais de treball"
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
@@ -235,110 +229,100 @@ msgid "Xfce 4 Workspaces Settings"
 msgstr "Paràmetres dels espais de treball d'Xfce 4"
 
 #: ../settings-dialogs/frap-shortcuts.c:92
-#, fuzzy
 msgid ""
 "This shortcut is already being used by <b>another window manager action</b>. "
 "Which action do you want to use?"
 msgstr ""
-"La drecera ja s'està emprant.\n"
-"Esteu segur de voler emprar-la?"
+"Aquesta drecera ja s'està emprant per <b>una altre acció del gestor de "
+"finestres</b>. Quina acció veleu emprar?"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 #: ../settings-dialogs/frap-shortcuts.c:96
 msgid "Use this action"
-msgstr ""
+msgstr "Empra aquesta acció"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 msgid "Keep the other one"
-msgstr ""
+msgstr "Manté l'altre"
 
 #: ../settings-dialogs/frap-shortcuts.c:95
 #: ../settings-dialogs/frap-shortcuts.c:98
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The shortcut is already being used for the command <b>%s</b>. Which action "
 "do you want to use?"
 msgstr ""
-"La drecera ja s'està emprant.\n"
-"Esteu segur de voler emprar-la?"
+"La drecera ja s'està emprant per l'ordre <b>%s</b>. Quina acció voleu emprar?"
 
 #: ../settings-dialogs/frap-shortcuts.c:96
 #: ../settings-dialogs/frap-shortcuts.c:99
 #, c-format
 msgid "Keep %s"
-msgstr ""
+msgstr "Manté «%s»"
 
 #: ../settings-dialogs/frap-shortcuts.c:99
 #: ../settings-dialogs/frap-shortcuts.c:102
 #, c-format
 msgid "Use %s"
-msgstr ""
+msgstr "Empra «%s»"
 
 #: ../settings-dialogs/frap-shortcuts.c:101
-#, fuzzy
 msgid ""
 "The shortcut is already being used by a <b>window manager action</b>. Which "
 "action do you want to use?"
 msgstr ""
-"La drecera ja s'està emprant.\n"
-"Esteu segur de voler emprar-la?"
+"La drecera ja s'està emprant per una <b>acció del gestor de finestres</b>. "
+"Quina acció veleu emprar?"
 
 #: ../settings-dialogs/frap-shortcuts.c:102
-#, fuzzy
 msgid "Keep the window manager action"
-msgstr "Paràmetres del gestor de finestres d'Xfce 4"
+msgstr "Manté aquesta acció del gestor de finestres"
 
 #: ../settings-dialogs/frap-shortcuts.c:134
 #: ../settings-dialogs/frap-shortcuts.c:141
 #, c-format
 msgid "Conflicting actions for %s"
-msgstr ""
+msgstr "Conflicte d'accions per %s"
 
 #: ../settings-dialogs/frap-shortcuts.c:173
-#, fuzzy
 msgid "The shortcut is already being used for something else."
-msgstr ""
-"La drecera ja s'està emprant.\n"
-"Esteu segur de voler emprar-la?"
+msgstr "La drecera ja s'està emprant per alguna altre cosa."
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:239
-#, fuzzy
 msgid "Enter window manager action shortcut"
-msgstr "Paràmetres del gestor de finestres d'Xfce 4"
+msgstr "Introduïu la drecera de l'acció del gestor de finestres"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:240
 #: ../settings-dialogs/frap-shortcuts-dialog.c:250
-#, fuzzy, c-format
+#, c-format
 msgid "Action: %s"
-msgstr "Actiu"
+msgstr "Acció: «%s»"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:244
 msgid "Enter command shortcut"
-msgstr ""
+msgstr "Introduïu la drecera de l'ordre"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "Command: %s"
-msgstr "Ordre"
+msgstr "Ordre: «%s»"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:249
-#, fuzzy
 msgid "Enter shortcut"
-msgstr "Sense drecera"
+msgstr "Introduïu drecera"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:280
-#, fuzzy
 msgid "Shortcut:"
-msgstr "Sense drecera"
+msgstr "Drecera:"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:324
 msgid "Could not grab the keyboard."
-msgstr ""
+msgstr "No s'ha pogut obtenir el teclat."
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:345
 #, c-format
 msgid "<span size='large'><b>%s</b></span>"
-msgstr ""
+msgstr "<span size='large'><b>%s</b></span>"
 
 #: ../settings-dialogs/xfwm4-settings.c:182
 msgid "Shade window"
@@ -375,29 +359,29 @@ msgstr "Dreta"
 #: ../settings-dialogs/xfwm4-settings.c:201
 #: ../settings-dialogs/workspace-settings.c:369
 msgid "Settings manager socket"
-msgstr ""
+msgstr "«Socket» del gestor d'ajustaments"
 
 #: ../settings-dialogs/xfwm4-settings.c:201
 #: ../settings-dialogs/tweaks-settings.c:396
 #: ../settings-dialogs/workspace-settings.c:369
 msgid "SOCKET ID"
-msgstr ""
+msgstr "«SOCKET» ID"
 
 #: ../settings-dialogs/xfwm4-settings.c:203
 #: ../settings-dialogs/tweaks-settings.c:397
 #: ../settings-dialogs/workspace-settings.c:370
 msgid "Version information"
-msgstr ""
+msgstr "Informació de la versió"
 
 #: ../settings-dialogs/xfwm4-settings.c:355
 msgid "Theme"
-msgstr ""
+msgstr "Tema"
 
 #: ../settings-dialogs/xfwm4-settings.c:791
 #: ../settings-dialogs/tweaks-settings.c:414
 #: ../settings-dialogs/workspace-settings.c:387
 msgid "."
-msgstr ""
+msgstr "."
 
 #: ../settings-dialogs/xfwm4-settings.c:795
 #: ../settings-dialogs/tweaks-settings.c:418
@@ -407,265 +391,228 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+"%s: %s\n"
+"Empreu %s --help per veure la llista sencera d'opcions i ordres.\n"
 
 #: ../settings-dialogs/xfwm4-settings.c:813
 #, c-format
 msgid "Failed to initialize xfconf. Reason: %s"
-msgstr ""
+msgstr "No s'ha pogut iniciar «xfconf». Motiu: %s"
 
 #: ../settings-dialogs/xfwm4-settings.c:824
 msgid "Could not create the settings dialog."
-msgstr ""
+msgstr "No s'ha pogut mostrar el diàleg de propietats."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
-#, fuzzy
 msgid "<i>Opaque</i>"
-msgstr "Opacitat"
+msgstr "<i>Opacitat<(i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
 msgid "<i>Transparent</i>"
-msgstr "Transparent"
+msgstr "<i>Transparència</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-#, fuzzy
 msgid "Activate _focus stealing prevention"
-msgstr "Activa la prevenció de furt de l'enfocament"
+msgstr "Activa la prevenció de furt d'en_focament"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 msgid "At the _center of the screen"
-msgstr ""
+msgstr "Al _centre de la pantalla"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 msgid "By default, place windows:"
-msgstr ""
+msgstr "Per defecte, posa les finestres:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
 msgid "C_ompositor"
-msgstr "«Compositor»"
+msgstr "«C_ompositor»"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-#, fuzzy
 msgid "C_ycling"
-msgstr "Rotació"
+msgstr "_Rotació"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-#, fuzzy
 msgid "Cycle _through windows on all workspaces"
-msgstr "Inclou les finestres dels altres espais de treball"
+msgstr "Rota en_tre les finestres de tots els espais de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
 msgid "Display _fullscreen overlay windows directly"
-msgstr "Visualitza directament les finestres que cobreixen tota la pantalla"
+msgstr "Mostra directament a pantalla sencera les _finestres"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
 msgid "Do _nothing"
-msgstr "Res"
+msgstr "_No fessis res"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-#, fuzzy
 msgid "Hide _frame of windows when maximized"
-msgstr "Amaga el marc de la finestra en maximitzar"
+msgstr "Amaga el _marc de les finestres al maximitzar-les"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-#, fuzzy
 msgid "Honor _standard ICCCM focus hint"
-msgstr "Fes cas de la senyal ICCCM d'enfocament"
+msgstr "Fes cas de la senyal e_standard d'enfocament ICCCM"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Keep urgent windows blinking"
-msgstr ""
+msgstr "Manté les finestres urgents fent pampallugues"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-#, fuzzy
 msgid "Key used to _grab and move windows:"
-msgstr "Tecla emprada per arrossegar i moure finestres"
+msgstr "Tecla emprada per arrosse_gar i moure finestres:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-#, fuzzy
 msgid "Opaci_ty of window decorations:"
-msgstr "Opacitat de la decoració de les finestres"
+msgstr "Opaci_tat de la decoració de les finestres:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-#, fuzzy
 msgid "Opacity of _inactive windows:"
-msgstr "Opacitat de les finestres inactives"
+msgstr "Opacitat de les finestres _inactives:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-#, fuzzy
 msgid "Opacity of popup window_s:"
-msgstr "Opacitat de les finestres emergents"
+msgstr "Opacitat de les finestres emergent_s:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-#, fuzzy
 msgid "Opacity of windows during _move:"
-msgstr "Opacitat de les finestres al moure-les"
+msgstr "Opacitat de les finestres al _moure-les:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-#, fuzzy
 msgid "Opacity of windows during resi_ze:"
-msgstr "Opacitat de les finestres al redimensinar-les"
+msgstr "Opacitat de les finestres al re_dimensinar-les:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
 msgid "Restore original _size of maximized windows when moving"
-msgstr "Restaura la mida original de les finestres maximitzades quan es mouen"
+msgstr "Recupera la _mida original de les finestres maximitzades quan es mouen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
 msgid "Show shadows under _dock windows"
-msgstr "Mostra ombres a les finestres anclades"
+msgstr "Mostra ombres a les finestres ancora_des"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
 msgid "Show shadows under _regular windows"
-msgstr "Mostra ombres a les finestres normals"
+msgstr "Mostra ombres a les finestres no_rmals"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
 msgid "Show shadows under pop_up windows"
-msgstr "Mostra ombres a les finestres emergents"
+msgstr "Mostra ombres a les finestres _emergents"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
 msgid "Size|<i>Large</i>"
-msgstr "Gran"
+msgstr "<i>Gran</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
 msgid "Size|<i>Small</i>"
-msgstr "Petit"
+msgstr "<i>Petit</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-#, fuzzy
 msgid "Switch to win_dow's workspace"
-msgstr "Mou la finestra a l’àrea de treball %d"
+msgstr "Canvia a l'espai de treball de la fines_tra"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 msgid "Under the mouse _pointer"
-msgstr ""
+msgstr "Sota el _punter del ratolí"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-#, fuzzy
 msgid "Use _edge resistance instead of window snapping"
 msgstr ""
-"Empra resistència a les vores en lloc de l'alineació ràpida de finestres"
+"Empra resistència a les vor_es en lloc de l'alineació ràpida de finestres"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 msgid "When a window raises itself:"
 msgstr "Quan una finestra s’alça:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-#, fuzzy
 msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "Canvia d'espai de treball en funció del format actual de l'escriptori"
+msgstr "Canvia d'espai de treball en funció del _format actual de l'escriptori"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-#, fuzzy
 msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "Canvia d'espai de treball quan s'arribi al primer o últim"
+msgstr "Canvia d'espai de treball quan s'arribi al _primer o últim"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-#, fuzzy
 msgid "_Accessibility"
-msgstr "Accessibilitat"
+msgstr "_Accesibilitat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
-#, fuzzy
 msgid "_Bring window on current workspace"
-msgstr "Mou la finestra a l'àrea de treball"
+msgstr "_Porta la finestra a l'actual espai de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
 msgid "_Draw frame around selected windows while cycling"
 msgstr ""
+"_Dibuixa el marc al voltant de les finestres seleccionades al rotar-les"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
 msgid "_Enable display compositing"
-msgstr "Habilita el composite"
+msgstr "_Habilita el «composite»"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-#, fuzzy
 msgid "_Focus"
-msgstr "Enfocament"
+msgstr "En_focament"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
 msgid "_Include hidden (i.e. iconified) windows"
-msgstr "Inclou les finestres amagades (i.e. les iconificades)"
+msgstr "_Inclou les finestres amagades (i.e. les iconificades)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-#, fuzzy
 msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "Mida mínima de les finestres per emplaçar-les «inteŀligentment»"
+msgstr "Mida _mínima de les finestres per emplaçar-les inteŀligentment:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 msgid "_Mouse wheel over desktop switches workspaces"
-msgstr ""
+msgstr "La roda del _ratolí en l'escriptori canvia d'espai de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-#, fuzzy
 msgid "_Placement"
-msgstr "Emplaçament"
+msgstr "_Posicionament"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-#, fuzzy
 msgid "_Raise windows when any mouse button is pressed"
-msgstr "Coŀloca en primer pla quan es pitgi qualsevol botó del ratolí"
+msgstr "Posa en p_rimer pla quan es pitgi qualsevol botó del ratolí"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-#, fuzzy
 msgid ""
 "_Remember and recall previous workspace\n"
 "when switching via keyboard shortcuts"
 msgstr ""
-"Recorda i recrida l'espai de treball previ quan canvii mitjançant les "
-"dreceres de tecles"
+"_Recorda i recrida l'espai de treball previ\n"
+"quan canvii mitjançant les dreceres de teclat"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-#, fuzzy
 msgid ""
 "_Skip windows that have \"skip pager\"\n"
 "or \"skip taskbar\" properties set"
 msgstr ""
-"Omet les finestres que tenen activades les propietats «omet el paginador» o "
-"«omet la barra de tasques»"
+"_Omet les finestres que tenen activades les propietats\n"
+"«omet el paginador» o «omet la barra de tasques»"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
-#, fuzzy
 msgid "_Workspaces"
-msgstr "Espais de treball"
+msgstr "_Espais de treball"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:10
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
 msgid "gtk-close"
-msgstr ""
+msgstr "gtk-close"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:11
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 msgid "gtk-help"
-msgstr ""
+msgstr "gtk-help"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Margins</b>"
-msgstr "Marges"
+msgstr "<b>Marges</b>"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Workspaces</b>"
-msgstr "Moviment entre els espais de treball"
+msgstr "<b>Espais de treball</b>"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
-#, fuzzy
 msgid "Change Workspace Name"
-msgstr "Noms dels espais de treball"
+msgstr "Canvia el nom de l'espai de treball"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
 msgid ""
@@ -675,24 +622,20 @@ msgstr ""
 "finestra"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
-#, fuzzy
 msgid "_Name:"
-msgstr "Nom:"
+msgstr "_Nom:"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
-#, fuzzy
 msgid "_Number of workspaces:"
-msgstr "Nombre d'espais de treball:"
+msgstr "_Nombre d'espais de treball:"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:9
-#, fuzzy
 msgid "gtk-cancel"
-msgstr "Canceŀla"
+msgstr "gtk-cancel"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:12
-#, fuzzy
 msgid "gtk-save"
-msgstr "Canceŀla"
+msgstr "gtk-save"
 
 #: ../settings-dialogs/tweaks-settings.c:42
 msgid "None"
@@ -700,7 +643,7 @@ msgstr "Cap"
 
 #: ../settings-dialogs/tweaks-settings.c:396
 msgid "Session manager socket"
-msgstr ""
+msgstr "«Socket» del gestor de sessió"
 
 #: ../settings-dialogs/workspace-settings.c:72
 #: ../settings-dialogs/workspace-settings.c:87
@@ -710,145 +653,121 @@ msgid "Workspace %d"
 msgstr "Espai de treball %d"
 
 #: ../settings-dialogs/workspace-settings.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "Change the name of workspace %d"
-msgstr "Nombre d'espais de treball:"
+msgstr "Canvia el nom de l'espai de treball %d"
 
 #: ../settings-dialogs/workspace-settings.c:275
-#, fuzzy
 msgid "Workspace Name"
-msgstr "Noms dels espais de treball"
+msgstr "Nom de l'espai de treball"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "  "
-msgstr ""
+msgstr "  "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Box move and resize</b>"
-msgstr "Opacitat al moure i redimensionar"
+msgstr "</b>Moure i redimensionar finestres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Button layout</b>"
-msgstr "Disseny dels botons"
+msgstr "<b>Disseny del botó</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-#, fuzzy
 msgid "<b>Double click _action</b>"
-msgstr "Acció del doble clic"
+msgstr "<b>_Acció del doble clic</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-#, fuzzy
 msgid "<b>Focus model</b>"
-msgstr "Tipus d'enfocament"
+msgstr "</b>Tipus d'enfocament</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
 msgid "<b>New window focus</b>"
-msgstr "Enfocament de les noves finestres"
+msgstr "<b>Enfoca de les finestres noves</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
 msgid "<b>Raise on click</b>"
-msgstr "Primer pla al pitjar"
+msgstr "<b>Primer pla al pitjar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-#, fuzzy
 msgid "<b>Raise on focus</b>"
-msgstr "Primer pla al enfocar"
+msgstr "<b>Primer pla al enfocar</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
 msgid "<b>Title _alignment</b>"
-msgstr "Alineació del títol"
+msgstr "<b>_Alineació del títol</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
 msgid "<b>Title fon_t</b>"
-msgstr "Font del títol"
+msgstr "<b>Font del _títol</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
 msgid "<b>Window _shortcuts</b>"
-msgstr "Dreceres de finestres"
+msgstr "<b>_Dreceres de finestres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
 msgid "<b>Windows snapping</b>"
-msgstr "Alineació ràpida de finestres"
+msgstr "<b>Alineació ràpida de finestres</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-#, fuzzy
 msgid "<b>Wrap workspaces</b>"
-msgstr "Moviment entre els espais de treball"
+msgstr "<b>Ajustament dels espais de treball</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:14
 msgid "Active"
 msgstr "Actiu"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "Avançat"
+msgstr "A_vançat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:16
-#, fuzzy
 msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"Automàticament coŀloca en primer pla les finestres quan rebin l'enfocament"
+msgstr "Automàticament posa en _primer pla les finestres enfocades"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
 msgid "Automatically give focus to _newly created windows"
-msgstr "Automàticament enfoca les finestres noves"
+msgstr "Automàticament enfoca les finestres _noves"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:18
-#, fuzzy
 msgid "Clic_k to focus"
-msgstr "S'enfoca al pitjar"
+msgstr "S'enfoca al _pitjar"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#, fuzzy
 msgid "Click and drag the buttons to change the layout"
-msgstr "Pitjeu i arrossegueu el botons per canviar el disseny"
+msgstr "Pitgeu i arrossegueu el botons per canviar el disseny"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:20
 msgid "Close"
 msgstr "Tanca"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-#, fuzzy
 msgid "Delay _before raising focused window:"
-msgstr "Retard abans de coŀlocar en primer pla la finestra:"
+msgstr "Retard a_bans de posar en primer pla la finestra enfocada:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 msgid "Delay|<i>Long</i>"
-msgstr ""
+msgstr "<i>Curt</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 msgid "Delay|<i>Short</i>"
-msgstr ""
+msgstr "<i>Curt</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
 msgid "Dis_tance:"
-msgstr "Distància:"
+msgstr "Dis_tància:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
 msgid "Distance|<i>Small</i>"
-msgstr "Petita"
+msgstr "<i>Petita</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
 msgid "Distance|<i>Wide</i>"
-msgstr "Gran"
+msgstr "<i>Gran</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-#, fuzzy
 msgid "Focus follows _mouse"
-msgstr "L'enfocament segueix el ratolí"
+msgstr "L'enfocament segueix el _ratolí"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:29
 msgid "Hidden"
@@ -859,19 +778,16 @@ msgid "Hide"
 msgstr "Amaga"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-#, fuzzy
 msgid "Hide content of windows when _moving"
-msgstr "Mostra el contingut de les finestres quan es mouen"
+msgstr "Amaga el contingut de les finestres quan es _moguin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-#, fuzzy
 msgid "Hide content of windows when _resizing"
-msgstr "Mostra el contingut de les finestres quan es redimensionen"
+msgstr "Amaga el contingut de les finestres quan es _redimensionin"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-#, fuzzy
 msgid "Ke_yboard"
-msgstr "Teclat"
+msgstr "_Teclat"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
 msgid "Maximize"
@@ -882,44 +798,37 @@ msgid "Menu"
 msgstr "Menú"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-#, fuzzy
 msgid "Raise window when clicking _inside application window"
 msgstr ""
-"Coŀloca en primer pla la finestra quan es pitgi dins la finestra de "
-"l’aplicació"
+"Posaen primer pla la finestra quan es pitgi d_ins la finestra de l’aplicació"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-#, fuzzy
 msgid "Resistance|<i>Small</i>"
-msgstr "Petita"
+msgstr "<i>Poca</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-#, fuzzy
 msgid "Resistance|<i>Wide</i>"
-msgstr "Gran"
+msgstr "<i>Molta</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 msgid "Shade"
 msgstr "Enrotlla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-#, fuzzy
 msgid "Snap windows to other _windows"
-msgstr "Alinea ràpidament les finestres amb les altres finestres"
+msgstr "Alinea ràpidament les finestres amb les altres _finestres"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:41
-#, fuzzy
 msgid "Snap windows to screen _border"
-msgstr "Alinea ràpidament les finestres a la vora de la pantalla"
+msgstr "Alinea ràpidament les finestres a la _vora de la pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
 msgid "Stick"
 msgstr "Omnipresent"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
 msgid "The action to perform when the title-bar is double-clicked"
-msgstr "Acció a realitzar quan es fa doble clic a la barra de títol:"
+msgstr "Acció quan es fa doble clic a la barra de títol"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
 msgid "The window title, it cannot be removed"
@@ -930,45 +839,39 @@ msgid "Title"
 msgstr "Títol"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-#, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
-"Canvia d'espai de treball quan s'arrossegui una finestra fora de la pantalla"
+"Canvia d'espai de treball quan s'_arrossegui una finestra fora de la pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:48
-#, fuzzy
 msgid "Wrap workspaces when the _pointer reaches the screen edge"
 msgstr ""
-"Canvia d'espai de treball quan el punter arribi a un dels laterals de la "
+"Canvia d'espai de treball quan el _punter arribi a un dels laterals de la "
 "pantalla"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
-#, fuzzy
 msgid "_Delay before window receives focus:"
-msgstr "Retard abans que la finestra guanyi el focus"
+msgstr "Retar_d abans que la finestra guanyi l'enfocament:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-#, fuzzy
 msgid "_Edge resistance:"
-msgstr "Resistència de les vores:"
+msgstr "Resistència de les _vores:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-#, fuzzy
 msgid "_Style"
-msgstr "Estil"
+msgstr "E_stil"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#, fuzzy
 msgid "gtk-clear"
-msgstr "Canceŀla"
+msgstr "gtk-clear"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:56
 msgid "gtk-revert-to-saved"
-msgstr ""
+msgstr "gtk-revert-to-saved"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:57
 msgid "gtk-select-all"
-msgstr ""
+msgstr "gtk-select-all"
 
 #~ msgid "Window operations menu"
 #~ msgstr "Menú d’operacions de finestra"
diff --git a/po/de.po b/po/de.po
index 615c91bd4..d9dc559bc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-18 22:05+0100\n"
-"PO-Revision-Date: 2008-09-18 22:56+0200\n"
+"POT-Creation-Date: 2008-10-19 13:49+0200\n"
+"PO-Revision-Date: 2008-10-19 12:54+0200\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,10 +23,12 @@ msgid ""
 "This window might be busy and is not responding.\n"
 "Do you want to terminate the application?"
 msgstr ""
+"Dieses Fenster scheint beschäftigt zu sein und antwortet nicht.\n"
+"Möchten Sie die Anwendung beenden?"
 
 #: ../helper-dialog/helper-dialog.c:89
 msgid "Warning"
-msgstr ""
+msgstr "Warnung"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:182
@@ -168,12 +170,12 @@ msgstr ""
 #: ../src/terminate.c:74
 #, c-format
 msgid "Error reading data from child process: %s\n"
-msgstr ""
+msgstr "Kann Daten vom Kindprozess nicht lesen: %s\n"
 
 #: ../src/terminate.c:122
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
-msgstr ""
+msgstr "Kann Hilfsdialog nicht starten: %s\n"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
@@ -226,13 +228,12 @@ msgid "Xfce 4 Workspaces Settings"
 msgstr "Xfce4-Arbeitsflächeneinstellungen"
 
 #: ../settings-dialogs/frap-shortcuts.c:92
-#, fuzzy
 msgid ""
 "This shortcut is already being used by <b>another window manager action</b>. "
 "Which action do you want to use?"
 msgstr ""
-"Dieses Tastenkürzel wird schon von der Aktion <b>%s</b> des Fenstermanagers "
-"benützt. Welche Aktion soll nun verwendet werden?"
+"Dieses Tastenkürzel wird schon von <b>einer anderen Aktion des "
+"Fenstermanagers</b> benützt. Welche Aktion soll nun verwendet werden?"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 #: ../settings-dialogs/frap-shortcuts.c:96
@@ -241,7 +242,7 @@ msgstr "Die eingestellte Aktion beibehalten"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 msgid "Keep the other one"
-msgstr ""
+msgstr "Die andere behalten"
 
 #: ../settings-dialogs/frap-shortcuts.c:95
 #: ../settings-dialogs/frap-shortcuts.c:98
@@ -274,7 +275,6 @@ msgstr ""
 "verwendet. Welche Aktion soll mit ihm zukünftig ausgeführt werden?"
 
 #: ../settings-dialogs/frap-shortcuts.c:102
-#, fuzzy
 msgid "Keep the window manager action"
 msgstr "Behalte die Fenstermanageraktion"
 
@@ -282,12 +282,11 @@ msgstr "Behalte die Fenstermanageraktion"
 #: ../settings-dialogs/frap-shortcuts.c:141
 #, c-format
 msgid "Conflicting actions for %s"
-msgstr ""
+msgstr "Im Konflikt stehende Aktionen für %s"
 
 #: ../settings-dialogs/frap-shortcuts.c:173
-#, fuzzy
 msgid "The shortcut is already being used for something else."
-msgstr "Das Tastenkürzel »%s« wird bereits für etwas anderes verwendet."
+msgstr "Das Tastenkürzel wird bereits für etwas anderes verwendet."
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:239
 msgid "Enter window manager action shortcut"
@@ -399,12 +398,11 @@ msgstr ""
 #: ../settings-dialogs/xfwm4-settings.c:813
 #, c-format
 msgid "Failed to initialize xfconf. Reason: %s"
-msgstr ""
+msgstr "Konnte xfconf nicht initialisieren. Grund: %s"
 
 #: ../settings-dialogs/xfwm4-settings.c:824
-#, fuzzy
 msgid "Could not create the settings dialog."
-msgstr "Konnte die Tastatur nicht verwenden."
+msgstr "Konnte den Einstellungsdialog nicht erzeugen."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "<i>Opaque</i>"
@@ -420,11 +418,11 @@ msgstr "Fo_kusverlust verhindern"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 msgid "At the _center of the screen"
-msgstr ""
+msgstr "In der _Mitte des Bildschirms"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 msgid "By default, place windows:"
-msgstr ""
+msgstr "Standardmäßig die Fester folgendermaßen platzieren:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
 msgid "C_ompositor"
@@ -456,7 +454,7 @@ msgstr "_Den normalen ICCCM-Fokus-Hinweis berücksichtigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Keep urgent windows blinking"
-msgstr ""
+msgstr "Dringende Fenster blinkend lassen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
 msgid "Key used to _grab and move windows:"
@@ -500,12 +498,10 @@ msgid "Show shadows under pop_up windows"
 msgstr "Scha_tten unter Popup-Fenstern anzeigen"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
 msgid "Size|<i>Large</i>"
 msgstr "<i>Groß</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
 msgid "Size|<i>Small</i>"
 msgstr "<i>Klein</i>"
 
@@ -515,7 +511,7 @@ msgstr "Z_ur Arbeitsfläche des Fensters wechseln"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 msgid "Under the mouse _pointer"
-msgstr ""
+msgstr "Unterhalb des _Mauszeigers"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
 msgid "Use _edge resistance instead of window snapping"
@@ -547,6 +543,7 @@ msgstr "F_enster auf die aktuelle Arbeitsfläche verschieben"
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
 msgid "_Draw frame around selected windows while cycling"
 msgstr ""
+"_Rahmen um die ausgewählten Fenster zeichnen während des Fesnterwechsels"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
 msgid "_Enable display compositing"
@@ -555,7 +552,7 @@ msgstr "A_nzeigen-Compositing aktivieren"
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 msgid "_Focus"
-msgstr "F_okus"
+msgstr "_Fokus"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
 msgid "_Include hidden (i.e. iconified) windows"
@@ -612,14 +609,12 @@ msgid "gtk-help"
 msgstr "gtk-help"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Margins</b>"
-msgstr "Seitenränder"
+msgstr "<b>Seitenränder</b>"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Workspaces</b>"
-msgstr "<b>Arbeitsflächen wechseln</b>"
+msgstr "<b>Arbeitsflächen</b>"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
 msgid "Change Workspace Name"
@@ -670,16 +665,15 @@ msgstr "Namen der Arbeitsfläche %d ändern"
 
 #: ../settings-dialogs/workspace-settings.c:275
 msgid "Workspace Name"
-msgstr "Name der Arbeitsflächen"
+msgstr "Name der Arbeitsfläche"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:1
-#, fuzzy
 msgid "  "
-msgstr " "
+msgstr "  "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:2
 msgid "<b>Box move and resize</b>"
-msgstr "<b>Kastenförmig bewegen und vergrößern</b>"
+msgstr "<b>Bewegen und vergrößern der Fensterbox</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 msgid "<b>Button layout</b>"
@@ -707,15 +701,15 @@ msgstr "<b>Hervorheben bei Fokus</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
 msgid "<b>Title _alignment</b>"
-msgstr "<b>_Titelausrichtung</b>"
+msgstr "<b>T_itelausrichtung</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
 msgid "<b>Title fon_t</b>"
-msgstr "<b>_Schrift im Titel</b>"
+msgstr "<b>Sch_rift im Titel</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
 msgid "<b>Window _shortcuts</b>"
-msgstr "<b>_Tastenkürzel für Fenster</b>"
+msgstr "<b>T_astenkürzel für Fenster</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
 msgid "<b>Windows snapping</b>"
@@ -743,7 +737,7 @@ msgstr "_Neue Fenster erhalten Fokus automatisch"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:18
 msgid "Clic_k to focus"
-msgstr "_Fokus durch Mausklick"
+msgstr "Fokus durch _Mausklick"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
 msgid "Click and drag the buttons to change the layout"
@@ -755,15 +749,13 @@ msgstr "Schließen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
 msgid "Delay _before raising focused window:"
-msgstr "_Dauer, bis ein Fenster in den Vordergrund gebracht wird:"
+msgstr "Da_uer, bis ein Fenster in den Vordergrund gebracht wird:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-#, fuzzy
 msgid "Delay|<i>Long</i>"
 msgstr "<i>Lang</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-#, fuzzy
 msgid "Delay|<i>Short</i>"
 msgstr "<i>Kurz</i>"
 
@@ -772,18 +764,16 @@ msgid "Dis_tance:"
 msgstr "_Abstand:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
 msgid "Distance|<i>Small</i>"
-msgstr "Klein"
+msgstr "<i>Klein</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
 msgid "Distance|<i>Wide</i>"
-msgstr "Groß"
+msgstr "<i>Groß</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
 msgid "Focus follows _mouse"
-msgstr "_Fokus folgt Mauszeiger"
+msgstr "Fokus folgt M_auszeiger"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:29
 msgid "Hidden"
@@ -795,11 +785,11 @@ msgstr "Verstecken"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
 msgid "Hide content of windows when _moving"
-msgstr "_Inhalt beim Verschieben verbergen"
+msgstr "Inhalt beim _Verschieben verbergen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 msgid "Hide content of windows when _resizing"
-msgstr "_Inhalt bei Größenänderung verbergen"
+msgstr "Inhalt bei _Größenänderung verbergen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
 msgid "Ke_yboard"
@@ -815,17 +805,15 @@ msgstr "Menü"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
 msgid "Raise window when clicking _inside application window"
-msgstr "_Hervorheben bei Klick in das Programmfenster"
+msgstr "H_ervorheben bei Klick in das Programmfenster"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-#, fuzzy
 msgid "Resistance|<i>Small</i>"
-msgstr "Klein"
+msgstr "<i>Klein</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-#, fuzzy
 msgid "Resistance|<i>Wide</i>"
-msgstr "Groß"
+msgstr "<i>Groß</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 msgid "Shade"
@@ -833,11 +821,11 @@ msgstr "Einrollen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
 msgid "Snap windows to other _windows"
-msgstr "_Fenster an anderen Fenstern einrasten lassen"
+msgstr "Fe_nster an anderen Fenstern einrasten lassen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:41
 msgid "Snap windows to screen _border"
-msgstr "_Fenster am Seitenrand einrasten lassen"
+msgstr "F_enster am Seitenrand einrasten lassen"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
 msgid "Stick"
@@ -858,12 +846,12 @@ msgstr "Titelleiste"
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
 msgid "Wrap workspaces when _dragging a window off the screen"
 msgstr ""
-"_Arbeitsfläche wechseln, wenn ein Fenster aus dem Sichtfeld gezogen wird"
+"A_rbeitsfläche wechseln, wenn ein Fenster aus dem Sichtfeld gezogen wird"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:48
 msgid "Wrap workspaces when the _pointer reaches the screen edge"
 msgstr ""
-"_Arbeitsfläche wechseln, wenn der Mauszeiger den Bildschirmrand erreicht"
+"Ar_beitsfläche wechseln, wenn der Mauszeiger den Bildschirmrand erreicht"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "_Delay before window receives focus:"
@@ -871,25 +859,23 @@ msgstr "_Dauer, bis ein Fenster den Fokus erhält:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 msgid "_Edge resistance:"
-msgstr "_Widerstand an den Kanten:"
+msgstr "W_iderstand an den Kanten:"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
 msgid "_Style"
 msgstr "_Stil"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#, fuzzy
 msgid "gtk-clear"
-msgstr "gtk-close"
+msgstr "gtk-clear"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:56
-#, fuzzy
 msgid "gtk-revert-to-saved"
-msgstr "gtk-remove"
+msgstr "gtk-revert-to-saved"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:57
 msgid "gtk-select-all"
-msgstr ""
+msgstr "gtk-select-all"
 
 #~ msgid "%s shortcut conflict"
 #~ msgstr "Tastenkürzelkonflikt bei »%s«"
diff --git a/po/fr.po b/po/fr.po
index 4484f59d3..69e2f2a8a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfwm4 4.4.0\n"
+"Project-Id-Version: xfwm4 4.5.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-18 22:05+0100\n"
-"PO-Revision-Date: 2008-10-12 22:59+0100\n"
+"PO-Revision-Date: 2008-10-19 10:44+0100\n"
 "Last-Translator: Maximilian Schleiss <maximilian@xfce.org>\n"
 "Language-Team: French <xfce-i18n@xfce.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../helper-dialog/helper-dialog.c:84
@@ -151,9 +151,7 @@ msgstr "%s: Ne peut allouer la couleur %s\n"
 #: ../src/settings.c:278
 #, c-format
 msgid "%s: Cannot allocate color: GValue for color is not of type STRING"
-msgstr ""
-"%s : Échec d'attribution de couleur : GValue de la couleur n'est pas de type "
-"STRING"
+msgstr "%s : Échec d'attribution de couleur : GValue de la couleur n'est pas de type STRING"
 
 #: ../src/settings.c:285
 #, c-format
@@ -163,19 +161,17 @@ msgstr "%s: Ne peut lire la couleur %s\n"
 #: ../src/settings.c:287
 #, c-format
 msgid "%s: Cannot parse color: GValue for color is not of type STRING"
-msgstr ""
-"%s : Échec d'analyse de couleur : GValue de la couleur n'est pas de type "
-"STRING"
+msgstr "%s : Échec d'analyse de couleur : GValue de la couleur n'est pas de type STRING"
 
 #: ../src/terminate.c:74
 #, c-format
 msgid "Error reading data from child process: %s\n"
-msgstr ""
+msgstr "Erreur de lecture depuis le processus : %s\n"
 
 #: ../src/terminate.c:122
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
-msgstr ""
+msgstr "Erreur de démarrage de la fenêtre d'aide : %s\n"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
@@ -228,13 +224,8 @@ msgid "Xfce 4 Workspaces Settings"
 msgstr "Xfce 4 Paramètres des espaces de travail"
 
 #: ../settings-dialogs/frap-shortcuts.c:92
-#, fuzzy
-msgid ""
-"This shortcut is already being used by <b>another window manager action</b>. "
-"Which action do you want to use?"
-msgstr ""
-"Ce raccourci est déjà pris en charge par l'action <b>%s</b> du gestionnaire "
-"de fenêtres. Quelle action voulez-vous utiliser ?"
+msgid "This shortcut is already being used by <b>another window manager action</b>. Which action do you want to use?"
+msgstr "Ce raccourci est déjà pris en charge par <b>un autre gestionnaire de fenêtres</b>. Quelle action voulez-vous utiliser ?"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 #: ../settings-dialogs/frap-shortcuts.c:96
@@ -243,17 +234,13 @@ msgstr "Utiliser cette action"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 msgid "Keep the other one"
-msgstr ""
+msgstr "Garder l'autre"
 
 #: ../settings-dialogs/frap-shortcuts.c:95
 #: ../settings-dialogs/frap-shortcuts.c:98
 #, c-format
-msgid ""
-"The shortcut is already being used for the command <b>%s</b>. Which action "
-"do you want to use?"
-msgstr ""
-"Ce raccourci est déjà pris en charge par la commande <b>%s</b>. Quelle "
-"action voulez-vous utiliser ?"
+msgid "The shortcut is already being used for the command <b>%s</b>. Which action do you want to use?"
+msgstr "Ce raccourci est déjà pris en charge par la commande <b>%s</b>. Quelle action voulez-vous utiliser ?"
 
 #: ../settings-dialogs/frap-shortcuts.c:96
 #: ../settings-dialogs/frap-shortcuts.c:99
@@ -268,15 +255,10 @@ msgid "Use %s"
 msgstr "Utiliser %s"
 
 #: ../settings-dialogs/frap-shortcuts.c:101
-msgid ""
-"The shortcut is already being used by a <b>window manager action</b>. Which "
-"action do you want to use?"
-msgstr ""
-"Ce raccourci est déjà pris en charge par une <b>action du gestionnaire de "
-"fenêtres</b>. Quelle action voulez-vous utiliser ?"
+msgid "The shortcut is already being used by a <b>window manager action</b>. Which action do you want to use?"
+msgstr "Ce raccourci est déjà pris en charge par une <b>action du gestionnaire de fenêtres</b>. Quelle action voulez-vous utiliser ?"
 
 #: ../settings-dialogs/frap-shortcuts.c:102
-#, fuzzy
 msgid "Keep the window manager action"
 msgstr "Garder l'action du gestionnaire de fenêtres"
 
@@ -284,12 +266,11 @@ msgstr "Garder l'action du gestionnaire de fenêtres"
 #: ../settings-dialogs/frap-shortcuts.c:141
 #, c-format
 msgid "Conflicting actions for %s"
-msgstr ""
+msgstr "Conflit d'action avec %s"
 
 #: ../settings-dialogs/frap-shortcuts.c:173
-#, fuzzy
 msgid "The shortcut is already being used for something else."
-msgstr "Le raccourci '%s' est déjà attribué."
+msgstr "Le raccourci est déjà attribué."
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:239
 msgid "Enter window manager action shortcut"
@@ -395,18 +376,16 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s : %s\n"
-"Essayez %s --help pour afficher une liste complète des options de ligne de "
-"commande.\n"
+"Essayez %s --help pour afficher une liste complète des options de ligne de commande.\n"
 
 #: ../settings-dialogs/xfwm4-settings.c:813
 #, c-format
 msgid "Failed to initialize xfconf. Reason: %s"
-msgstr ""
+msgstr "Échec d'initialisation de xfconf. Raison : %s"
 
 #: ../settings-dialogs/xfwm4-settings.c:824
-#, fuzzy
 msgid "Could not create the settings dialog."
-msgstr "Le clavier n'a pas pu être saisi."
+msgstr "Impossible de créer la boîte de dialogue des paramètres."
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
 msgid "<i>Opaque</i>"
@@ -462,7 +441,7 @@ msgstr "Laisser clignoter les fenêtres urgentes"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
 msgid "Key used to _grab and move windows:"
-msgstr "Touche utilisée pour saisir et déplacer les fenêtres :"
+msgstr "Touche utilisée pour _saisir et déplacer les fenêtres :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
 msgid "Opaci_ty of window decorations:"
@@ -503,12 +482,12 @@ msgstr "Afficher l'ombre sous les fenêtres context_uelles"
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
 #, fuzzy
 msgid "Size|<i>Large</i>"
-msgstr "<i>Grande</i>"
+msgstr "Grande"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
 #, fuzzy
 msgid "Size|<i>Small</i>"
-msgstr "<i>Faible</i>"
+msgstr "Petite"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
 msgid "Switch to win_dow's workspace"
@@ -532,8 +511,7 @@ msgstr "Basculer d'espace en fonction de l'_agencement du bureau"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
 msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr ""
-"Basculer d'espace de travail après en avoir atteint le premier ou le dernier"
+msgstr "Basculer d'espace de travail après en avoir atteint le _premier ou le dernier"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
 msgid "_Accessibility"
@@ -545,8 +523,7 @@ msgstr "_Placer la fenêtre dans l'espace de travail actif"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
 msgid "_Draw frame around selected windows while cycling"
-msgstr ""
-"_Dessiner un cadre autour de la fenêtre sélectionnée lors de la navigation"
+msgstr "_Dessiner un cadre autour de la fenêtre sélectionnée lors de la navigation"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
 msgid "_Enable display compositing"
@@ -567,9 +544,7 @@ msgstr "Taille _minimale de fenêtre pour utiliser le placement intelligent :"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 msgid "_Mouse wheel over desktop switches workspaces"
-msgstr ""
-"Basculer d'espace de travail à l'aide de la _molette de la souris sur le "
-"bureau"
+msgstr "Basculer d'espace de travail à l'aide de la _molette de la souris sur le bureau"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
 msgid "_Placement"
@@ -592,7 +567,7 @@ msgid ""
 "_Skip windows that have \"skip pager\"\n"
 "or \"skip taskbar\" properties set"
 msgstr ""
-"Ignorer les fenêtres qui présentent les propriétés\n"
+"_Ignorer les fenêtres qui présentent les propriétés\n"
 "\"skip pager\" ou \"skip taskbar\""
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
@@ -624,11 +599,8 @@ msgid "Change Workspace Name"
 msgstr "Renommer l'espace de travail"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
-msgid ""
-"Margins are areas on the edges of the screen where no window will be placed"
-msgstr ""
-"Les marges sont des zones dans les bords de l'écran où aucune fenêtre ne "
-"sera placée"
+msgid "Margins are areas on the edges of the screen where no window will be placed"
+msgstr "Les marges sont des zones dans les bords de l'écran où aucune fenêtre ne sera placée"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid "_Name:"
@@ -732,8 +704,7 @@ msgstr "A_vancé"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:16
 msgid "Automatically _raise windows when they receive focus"
-msgstr ""
-"Mettre au premier plan les fenêtres lorsqu'elles _reçoivent l'attention"
+msgstr "Mettre au premier plan les fenêtres lorsqu'elles _reçoivent l'attention"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
 msgid "Automatically give focus to _newly created windows"
@@ -756,28 +727,24 @@ msgid "Delay _before raising focused window:"
 msgstr "Délai _avant la mise au premier plan :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
-#, fuzzy
 msgid "Delay|<i>Long</i>"
-msgstr "<i>Long</i>"
+msgstr "Delay|<i>Long</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
-#, fuzzy
 msgid "Delay|<i>Short</i>"
-msgstr "<i>Court</i>"
+msgstr "Delay|<i>Court</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:25
 msgid "Dis_tance:"
 msgstr "Dis_tance :"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
 msgid "Distance|<i>Small</i>"
-msgstr "Courte"
+msgstr "Distance|<i>Faible</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
 msgid "Distance|<i>Wide</i>"
-msgstr "Longue"
+msgstr "Distance|<i>Grande</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
 msgid "Focus follows _mouse"
@@ -816,14 +783,12 @@ msgid "Raise window when clicking _inside application window"
 msgstr "Mettre au premier plan en cl_iquant dans la fenêtre"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-#, fuzzy
 msgid "Resistance|<i>Small</i>"
-msgstr "Légère"
+msgstr "Distance|<i>Faible</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-#, fuzzy
 msgid "Resistance|<i>Wide</i>"
-msgstr "Forte"
+msgstr "Distance|<i>Forte</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
 msgid "Shade"
@@ -855,13 +820,11 @@ msgstr "Titre"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
 msgid "Wrap workspaces when _dragging a window off the screen"
-msgstr ""
-"Basculer d'espace de travail en déplaçant une fenêtre au bord de l'écran"
+msgstr "Basculer d'espace de travail en _déplaçant une fenêtre au bord de l'écran"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:48
 msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr ""
-"Basculer d'espace de travail lorsque le pointeur arrive au bord de l'écran"
+msgstr "Basculer d'espace de travail lorsque le _pointeur arrive au bord de l'écran"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid "_Delay before window receives focus:"
@@ -876,161 +839,115 @@ msgid "_Style"
 msgstr "_Style"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#, fuzzy
 msgid "gtk-clear"
-msgstr "Fermer"
+msgstr "effacer"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:56
 msgid "gtk-revert-to-saved"
-msgstr ""
+msgstr "revenir à l'état précédant"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:57
 msgid "gtk-select-all"
-msgstr ""
+msgstr "tout sélectionner"
 
 #~ msgid "%s shortcut conflict"
 #~ msgstr "Conflit de raccourci %s"
-
 #~ msgid "Shortcut conflict"
 #~ msgstr "Conflit de raccourci"
-
 #~ msgid "Window operations menu"
 #~ msgstr "Menu des opérations de fenêtre"
-
 #~ msgid "Up"
 #~ msgstr "Haut"
-
 #~ msgid "Down"
 #~ msgstr "Bas"
-
 #~ msgid "Cancel"
 #~ msgstr "Annuler"
-
 #~ msgid "Cycle windows"
 #~ msgstr "Naviguer entre les fenêtres"
-
 #~ msgid "Close window"
 #~ msgstr "Fermer la fenêtre"
-
 #~ msgid "Maximize window horizontally"
 #~ msgstr "Agrandir la fenêtre horizontalement"
-
 #~ msgid "Maximize window vertically"
 #~ msgstr "Agrandir la fenêtre verticalement"
-
 #~ msgid "Move window"
 #~ msgstr "Déplacer la fenêtre"
-
 #~ msgid "Resize window"
 #~ msgstr "Redimensionner la fenêtre"
-
 #~ msgid "Stick window"
 #~ msgstr "Coller la fenêtre"
-
 #~ msgid "Raise window"
 #~ msgstr "Relever la fenêtre"
-
 #~ msgid "Lower window"
 #~ msgstr "Abaisser la fenêtre"
-
 #~ msgid "Fill window horizontally"
 #~ msgstr "Étendre la fenêtre horizontalement"
-
 #~ msgid "Fill window vertically"
 #~ msgstr "Étendre la fenêtre verticalement"
-
 #~ msgid "Toggle above"
 #~ msgstr "Basculer au dessus"
-
 #~ msgid "Toggle fullscreen"
 #~ msgstr "Basculer en mode plein écran"
-
 #~ msgid "Move window to upper workspace"
 #~ msgstr "Déplacer la fenêtre vers l'espace supérieur"
-
 #~ msgid "Move window to bottom workspace"
 #~ msgstr "Déplacer la fenêtre vers l'espace inférieur"
-
 #~ msgid "Move window to left workspace"
 #~ msgstr "Déplacer la fenêtre vers l'espace à gauche"
-
 #~ msgid "Move window to right workspace"
 #~ msgstr "Déplacer la fenêtre vers l'espace à droite"
-
 #~ msgid "Move window to previous workspace"
 #~ msgstr "Déplacer la fenêtre vers l'espace précédent"
-
 #~ msgid "Move window to next workspace"
 #~ msgstr "Déplacer la fenêtre vers l'espace suivant"
-
 #~ msgid "Show desktop"
 #~ msgstr "Afficher le bureau"
-
 #~ msgid "Upper workspace"
 #~ msgstr "Espace de travail supérieur"
-
 #~ msgid "Bottom workspace"
 #~ msgstr "Espace de travail inférieur"
-
 #~ msgid "Left workspace"
 #~ msgstr "Espace de travail à gauche"
-
 #~ msgid "Right workspace"
 #~ msgstr "Espace de travail à droite"
-
 #~ msgid "Previous workspace"
 #~ msgstr "Espace de travail précédent"
-
 #~ msgid "Next workspace"
 #~ msgstr "Espace de travail suivant"
-
 #~ msgid "Add workspace"
 #~ msgstr "Ajouter un espace de travail"
-
 #~ msgid "Add adjacent workspace"
 #~ msgstr "Ajouter un espace de travail"
-
 #~ msgid "Delete last workspace"
 #~ msgstr "Effacer le dernier espace de travail"
-
 #~ msgid "Delete active workspace"
 #~ msgstr "Effacer l'espace de travail actif"
-
 #~ msgid "Action"
 #~ msgstr "Action"
-
 #~ msgid "Shortcut"
 #~ msgstr "Raccourci"
-
 #~ msgid "<i>Wide</i>"
 #~ msgstr "<i>Large</i>"
-
 #~ msgid "_Reset to defaults"
 #~ msgstr "_Réinitialiser les options"
-
 #~ msgid "Alt"
 #~ msgstr "Alt"
-
 #~ msgid "Ctrl"
 #~ msgstr "Contrôle"
-
 #~ msgid "\t"
 #~ msgstr "\t"
-
 #~ msgid ""
 #~ "Set shortcut for action\n"
 #~ "<b>%s</b>"
 #~ msgstr ""
 #~ "Définir le raccourci pour l'action\n"
 #~ "<b>%s</b>"
-
 #~ msgid ""
 #~ "Set shortcut for command\n"
 #~ "<b>%s</b>"
 #~ msgstr ""
 #~ "Définir le raccourci pour la commande\n"
 #~ "<b>%s</b>"
-
 #~ msgid ""
 #~ "Set shortcut for\n"
 #~ "<b>%s</b>"
@@ -1041,13 +958,10 @@ msgstr ""
 #, fuzzy
 #~ msgid "Button"
 #~ msgstr "Agencement des boutons"
-
 #~ msgid "A keybinding theme with the same name already exists"
 #~ msgstr "Un thème de raccourcis avec le même nom existe déjà"
-
 #~ msgid "You have to provide a name for the keybinding theme"
 #~ msgstr "Il faut spécifier un nom pour le thème de raccourcis"
-
 #~ msgid "Do you really want to remove this keybinding theme ?"
 #~ msgstr "Souhaitez-vous vraiment supprimer ce thème de raccourcis claviers ?"
 
@@ -1058,135 +972,95 @@ msgstr ""
 #, fuzzy
 #~ msgid "Type the name for the new shortcut theme:"
 #~ msgstr "Indiquer le nom du thème :"
-
 #~ msgid "Workspace Margins"
 #~ msgstr "Marges de l'espace de travail"
-
 #~ msgid "Left :"
 #~ msgstr "Gauche :"
-
 #~ msgid "Right :"
 #~ msgstr "Droit :"
-
 #~ msgid "Top :"
 #~ msgstr "Haut :"
-
 #~ msgid "Bottom :"
 #~ msgstr "Bas :"
-
 #~ msgid "Button Label|Workspaces and Margins"
 #~ msgstr "Marges et espaces de travail"
-
 #~ msgid "Workspaces and Margins"
 #~ msgstr "Marges et espaces de travail"
-
 #~ msgid "Place window under the mouse"
 #~ msgstr "Placer la fenêtre sous la souris"
-
 #~ msgid "Place window in the center"
 #~ msgstr "Placer la fenêtre au centre"
-
 #~ msgid "Switch workspaces using the mouse wheel over the desktop"
 #~ msgstr "Basculer d'écran à l'aide de la molette de la souris sur le bureau"
-
 #~ msgid "Size|Small"
 #~ msgstr "Petite"
-
 #~ msgid "Size|Large"
 #~ msgstr "Grande"
-
 #~ msgid "Default positionning of windows without smart placement:"
 #~ msgstr "Mode de positionnement des fenêtres sans le placement intelligent :"
-
 #~ msgid "Button Label|Window Manager Tweaks"
 #~ msgstr "Peaufinage des fenêtres"
-
 #~ msgid "These settings cannot work with your current window manager (%s)"
 #~ msgstr ""
 #~ "Ces paramètres ne s'appliquent pas au gestionnaire de fenêtre courant (%s)"
-
 #~ msgid "Change name"
 #~ msgstr "Modifier le nom"
-
 #~ msgid "Click on a workspace name to edit it"
 #~ msgstr "Cliquez sur le nom d'un espace de travail pour l'éditer"
-
 #~ msgid "Font Selection Dialog"
 #~ msgstr "Sélection de la police"
-
 #~ msgid "Text alignment inside title bar :"
 #~ msgstr "Alignement du texte dans la barre de titre :"
-
 #~ msgid "Slow"
 #~ msgstr "Lent"
-
 #~ msgid "Fast"
 #~ msgstr "Rapide"
-
 #~ msgid "Button Label|Window Manager"
 #~ msgstr "Gestionnaire de fenêtres"
-
 #~ msgid "Add keybinding theme"
 #~ msgstr "Ajouter un thème de raccourcis claviers"
-
 #~ msgid "Move window to workspace %d"
 #~ msgstr "Déplacer la fenêtre vers l'espace %d"
-
 #~ msgid "Cannot open the theme directory !"
 #~ msgstr "Impossible d'ouvrir le répertoire de thèmes !"
-
 #~ msgid ""
 #~ "Cannot open %s : \n"
 #~ "%s"
 #~ msgstr ""
 #~ "Impossible d'ouvrir %s : \n"
 #~ "%s"
-
 #~ msgid ""
 #~ "Cannot write in %s : \n"
 #~ "%s"
 #~ msgstr ""
 #~ "Impossible d'écrire %s : \n"
 #~ "%s"
-
 #~ msgid "Compose shortcut for :"
 #~ msgstr "Composer le raccourci pour :"
-
 #~ msgid "Compose shortcut"
 #~ msgstr "Composer le raccourci"
-
 #~ msgid "Advanced Configuration"
 #~ msgstr "Configuration avancée"
-
 #~ msgid "Move window down"
 #~ msgstr "Déplacer la fenêtre vers le bas"
-
 #~ msgid "Move window left"
 #~ msgstr "Déplacer la fenêtre vers la gauche"
-
 #~ msgid "Move window right"
 #~ msgstr "Déplacer la fenêtre vers la droite"
-
 #~ msgid "Resize window down"
 #~ msgstr "Retailler la fenêtre vers le bas"
-
 #~ msgid "Resize window left"
 #~ msgstr "Retailler la fenêtre vers la gauche"
-
 #~ msgid "Resize window right"
 #~ msgstr "Retailler la fenêtre vers la droite"
-
 #~ msgid "Cancel move/resize window"
 #~ msgstr "Annuler le déplacement/redimensionnement de la fenêtre"
-
 #~ msgid "Un_maximize"
 #~ msgstr "_Restaurer"
-
 #~ msgid "_Hide"
 #~ msgstr "Cac_her"
-
 #~ msgid "Always on top"
 #~ msgstr "Placer au dessus"
-
 #~ msgid "Unknown application!"
 #~ msgstr "Application inconnue!"
+
diff --git a/po/ja.po b/po/ja.po
index ba6372d86..e1cbd4fdd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,11 +15,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfwm4 4.5.0\n"
+"Project-Id-Version: xfwm4 4.5.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-18 22:05+0100\n"
-"PO-Revision-Date: 2008-05-20 06:26+0900\n"
-"Last-Translator: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>\n"
+"POT-Creation-Date: 2008-10-19 15:04+0900\n"
+"PO-Revision-Date: 2008-10-18 21:39+0900\n"
+"Last-Translator: Masato Hashimoto <cabezon.hashimoto@gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,10 +30,12 @@ msgid ""
 "This window might be busy and is not responding.\n"
 "Do you want to terminate the application?"
 msgstr ""
+"このウィンドウはビジーのようで応答がありません。\n"
+"アプリケーションを終了させますか?"
 
 #: ../helper-dialog/helper-dialog.c:89
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host
 #: ../src/client.c:182
@@ -51,14 +53,12 @@ msgid "Ma_ximize"
 msgstr "最大化(_X)"
 
 #: ../src/menu.c:44
-#, fuzzy
 msgid "(Un)Ma_ximize"
-msgstr "最大化(_X)"
+msgstr "元に戻す(_X)"
 
 #: ../src/menu.c:45
-#, fuzzy
 msgid "Mi_nimize"
-msgstr "最大化(_X)"
+msgstr "最小化(_X)"
 
 #: ../src/menu.c:46
 msgid "Hide _all others"
@@ -70,29 +70,27 @@ msgstr "表示(_H)"
 
 #: ../src/menu.c:48
 msgid "_Move"
-msgstr ""
+msgstr "移動(_M)"
 
 #: ../src/menu.c:49
 msgid "_Resize"
-msgstr ""
+msgstr "サイズ変更(_R)"
 
 #: ../src/menu.c:51
 msgid "_Shade"
 msgstr "折り畳む(_S)"
 
 #: ../src/menu.c:52
-#, fuzzy
 msgid "(Un)_Shade"
-msgstr "伸ばす(_S)"
+msgstr "元に戻す(_S)"
 
 #: ../src/menu.c:53
 msgid "S_tick"
 msgstr "貼る(_T)"
 
 #: ../src/menu.c:54
-#, fuzzy
 msgid "(Un)S_tick"
-msgstr "剥す(_T)"
+msgstr "元に戻す(_T)"
 
 #: ../src/menu.c:55
 msgid "Context _help"
@@ -100,29 +98,27 @@ msgstr "コンテキストヘルプ(_H)"
 
 #: ../src/menu.c:57
 msgid "Above"
-msgstr ""
+msgstr "常に最前面へ"
 
 #: ../src/menu.c:58
 msgid "Normal"
-msgstr ""
+msgstr "通常"
 
 #: ../src/menu.c:59
-#, fuzzy
 msgid "Below"
-msgstr "遅い"
+msgstr "常に最後面へ"
 
 #: ../src/menu.c:60
-#, fuzzy
 msgid "_Fullscreen"
-msgstr "全画面に切替える"
+msgstr "全画面化(_F)"
 
 #: ../src/menu.c:61
 msgid "(Un)_Fullscreen"
-msgstr ""
+msgstr "元に戻す(_F)"
 
 #: ../src/menu.c:62
 msgid "Send to..."
-msgstr "送る..."
+msgstr "送る"
 
 #: ../src/menu.c:64
 msgid "_Close"
@@ -158,12 +154,12 @@ msgstr "%s: GtkMenu はポインタを取得できませんでした\n"
 #: ../src/settings.c:276
 #, c-format
 msgid "%s: Cannot allocate color %s\n"
-msgstr "%s: 色 %s を割当てられません\n"
+msgstr "%s: 色 %s を割り当てられません\n"
 
 #: ../src/settings.c:278
 #, c-format
 msgid "%s: Cannot allocate color: GValue for color is not of type STRING"
-msgstr ""
+msgstr "%s: 色を割り当てられません: 色の GValue が STRING 型ではありません"
 
 #: ../src/settings.c:285
 #, c-format
@@ -173,23 +169,22 @@ msgstr "%s: 色 %s を解析できません\n"
 #: ../src/settings.c:287
 #, c-format
 msgid "%s: Cannot parse color: GValue for color is not of type STRING"
-msgstr ""
+msgstr "%s: 色を解析できません: 色の GValue が STRING 型ではありません"
 
 #: ../src/terminate.c:74
 #, c-format
 msgid "Error reading data from child process: %s\n"
-msgstr ""
+msgstr "子プロセスからのデータ読み込みエラーです: %s\n"
 
 #: ../src/terminate.c:122
 #, c-format
 msgid "Cannot spawn helper-dialog: %s\n"
-msgstr ""
+msgstr "ヘルパーダイアログを生成できませんでした: %s\n"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-dialog.glade.h:21
-#, fuzzy
 msgid "Configure window behavior"
-msgstr "ウィンドウアクションのキャンセル"
+msgstr "ウィンドウの振る舞いを設定します"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
@@ -199,33 +194,31 @@ msgstr "ウィンドウマネージャー"
 # FIXME: should be separated in between `Comment' and  `GenericName'
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:3
 msgid "Window Manager Settings"
-msgstr "ウィンドウマネージャー"
+msgstr "ウィンドウマネージャー設定"
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:4
 msgid "Xfce 4 Window Manager Settings"
-msgstr "Xfce 4 ウィンドウマネージャーの設定"
+msgstr "Xfce 4 ウィンドウマネージャー設定"
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:4
-#, fuzzy
 msgid "Advanced window manager settings"
-msgstr "Xfce 4 ウィンドウマネージャーの設定"
+msgstr "ウィンドウマネージャーの拡張設定"
 
 # FIXME: Q_()
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
 msgid "Window Manager Tweaks"
-msgstr "ウィンドウマネージャー (詳細)"
+msgstr "ウィンドウマネージャー設定 (詳細)"
 
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:3
 msgid "Xfce 4 Window Manager Tweaks"
-msgstr "Xfce 4 ウィンドウマネージャーの調整"
+msgstr "Xfce 4 ウィンドウマネージャー設定 (詳細)"
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
-#, fuzzy
 msgid "Set number and names of workspaces"
-msgstr "ワークスペースの数:"
+msgstr "ワークスペースの数と名前を設定してください"
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6
@@ -235,117 +228,108 @@ msgstr "ワークスペース"
 # FIXME: should be separated in between `Comment' and  `GenericName'
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:3
 msgid "Workspaces Settings"
-msgstr "ワークスペース"
+msgstr "ワークスペースの設定"
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:4
 msgid "Xfce 4 Workspaces Settings"
 msgstr "Xfce 4 ワークスペースの設定"
 
 #: ../settings-dialogs/frap-shortcuts.c:92
-#, fuzzy
 msgid ""
 "This shortcut is already being used by <b>another window manager action</b>. "
 "Which action do you want to use?"
 msgstr ""
-"ショートカットは既に使用されています！\n"
-"これに使用してよろしいですか？"
+"ショートカットキーは既に<b>他のウィンドウマネージャーの動作</b>で使用されてい"
+"ます。どちらの動作に使用しますか?"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 #: ../settings-dialogs/frap-shortcuts.c:96
 msgid "Use this action"
-msgstr ""
+msgstr "この動作で使用"
 
 #: ../settings-dialogs/frap-shortcuts.c:93
 msgid "Keep the other one"
-msgstr ""
+msgstr "他のもので継続使用"
 
 #: ../settings-dialogs/frap-shortcuts.c:95
 #: ../settings-dialogs/frap-shortcuts.c:98
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The shortcut is already being used for the command <b>%s</b>. Which action "
 "do you want to use?"
 msgstr ""
-"ショートカットは既に使用されています！\n"
-"これに使用してよろしいですか？"
+"ショートカットキーは既にコマンド <b>%s</b> で使用されています。どちらの動作で"
+"使用しますか?"
 
 #: ../settings-dialogs/frap-shortcuts.c:96
 #: ../settings-dialogs/frap-shortcuts.c:99
 #, c-format
 msgid "Keep %s"
-msgstr ""
+msgstr "%s で継続使用"
 
 #: ../settings-dialogs/frap-shortcuts.c:99
 #: ../settings-dialogs/frap-shortcuts.c:102
 #, c-format
 msgid "Use %s"
-msgstr ""
+msgstr "%s で使用"
 
 #: ../settings-dialogs/frap-shortcuts.c:101
-#, fuzzy
 msgid ""
 "The shortcut is already being used by a <b>window manager action</b>. Which "
 "action do you want to use?"
 msgstr ""
-"ショートカットは既に使用されています！\n"
-"これに使用してよろしいですか？"
+"ショートカットキーは既に<b>ウィンドウマネージャーの動作</b>で使用されていま"
+"す。どちらの動作で使用しますか?"
 
 #: ../settings-dialogs/frap-shortcuts.c:102
-#, fuzzy
 msgid "Keep the window manager action"
-msgstr "Xfce 4 ウィンドウマネージャーの設定"
+msgstr "ウィンドウマネージャーの動作で継続使用"
 
 #: ../settings-dialogs/frap-shortcuts.c:134
 #: ../settings-dialogs/frap-shortcuts.c:141
 #, c-format
 msgid "Conflicting actions for %s"
-msgstr ""
+msgstr "%s の動作と衝突"
 
 #: ../settings-dialogs/frap-shortcuts.c:173
-#, fuzzy
 msgid "The shortcut is already being used for something else."
-msgstr ""
-"ショートカットは既に使用されています！\n"
-"これに使用してよろしいですか？"
+msgstr "ショートカットキーは既に他で使用されています。"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:239
-#, fuzzy
 msgid "Enter window manager action shortcut"
-msgstr "Xfce 4 ウィンドウマネージャーの設定"
+msgstr "ウィンドウマネージャーの動作のショートカットキーを入力してください"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:240
 #: ../settings-dialogs/frap-shortcuts-dialog.c:250
-#, fuzzy, c-format
+#, c-format
 msgid "Action: %s"
-msgstr "アクティブ"
+msgstr "動作: %s"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:244
 msgid "Enter command shortcut"
-msgstr ""
+msgstr "コマンドのショートカットキーを入力してください"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "Command: %s"
-msgstr "コマンド"
+msgstr "コマンド: %s"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:249
-#, fuzzy
 msgid "Enter shortcut"
-msgstr "ショートカット無し"
+msgstr "ショートカットキーを入力してください"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:280
-#, fuzzy
 msgid "Shortcut:"
-msgstr "ショートカット無し"
+msgstr "ショートカットキー:"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:324
 msgid "Could not grab the keyboard."
-msgstr ""
+msgstr "キーボードを取得できませんでした。"
 
 #: ../settings-dialogs/frap-shortcuts-dialog.c:345
 #, c-format
 msgid "<span size='large'><b>%s</b></span>"
-msgstr ""
+msgstr "<span size='large'><b>%s</b></span>"
 
 #: ../settings-dialogs/xfwm4-settings.c:182
 msgid "Shade window"
@@ -357,11 +341,11 @@ msgstr "ウィンドウを隠す"
 
 #: ../settings-dialogs/xfwm4-settings.c:184
 msgid "Maximize window"
-msgstr "ウィンドウの最大化"
+msgstr "ウィンドウを最大化する"
 
 #: ../settings-dialogs/xfwm4-settings.c:185
 msgid "Fill window"
-msgstr "ウィンドウを最大化する"
+msgstr "ウィンドウを全画面化する"
 
 #: ../settings-dialogs/xfwm4-settings.c:186
 msgid "Nothing"
@@ -382,29 +366,29 @@ msgstr "右"
 #: ../settings-dialogs/xfwm4-settings.c:201
 #: ../settings-dialogs/workspace-settings.c:369
 msgid "Settings manager socket"
-msgstr ""
+msgstr "マネージャソケットの設定"
 
 #: ../settings-dialogs/xfwm4-settings.c:201
 #: ../settings-dialogs/tweaks-settings.c:396
 #: ../settings-dialogs/workspace-settings.c:369
 msgid "SOCKET ID"
-msgstr ""
+msgstr "SOCKET ID"
 
 #: ../settings-dialogs/xfwm4-settings.c:203
 #: ../settings-dialogs/tweaks-settings.c:397
 #: ../settings-dialogs/workspace-settings.c:370
 msgid "Version information"
-msgstr ""
+msgstr "バージョン情報"
 
 #: ../settings-dialogs/xfwm4-settings.c:355
 msgid "Theme"
-msgstr ""
+msgstr "テーマ"
 
 #: ../settings-dialogs/xfwm4-settings.c:791
 #: ../settings-dialogs/tweaks-settings.c:414
 #: ../settings-dialogs/workspace-settings.c:387
 msgid "."
-msgstr ""
+msgstr "."
 
 #: ../settings-dialogs/xfwm4-settings.c:795
 #: ../settings-dialogs/tweaks-settings.c:418
@@ -414,277 +398,241 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+"%s: %s\n"
+"%s --help で使用可能な全てのコマンドラインオプションが表示されます。\n"
 
 #: ../settings-dialogs/xfwm4-settings.c:813
 #, c-format
 msgid "Failed to initialize xfconf. Reason: %s"
-msgstr ""
+msgstr "xfconf の初期化に失敗しました。理由: %s"
 
 #: ../settings-dialogs/xfwm4-settings.c:824
 msgid "Could not create the settings dialog."
-msgstr ""
+msgstr "設定ダイアログボックスの生成ができませんでした。"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1
-#, fuzzy
 msgid "<i>Opaque</i>"
-msgstr "不透明"
+msgstr "<i>不透明</i>"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2
-#, fuzzy
 msgid "<i>Transparent</i>"
-msgstr "透明"
+msgstr "<i>透明</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3
-#, fuzzy
 msgid "Activate _focus stealing prevention"
-msgstr "フォーカスの横取りを防ぐ"
+msgstr "アクティブ化フォーカスの横取りを防ぐ(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5
 msgid "At the _center of the screen"
-msgstr ""
+msgstr "画面の中央(_C)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:6
 msgid "By default, place windows:"
-msgstr ""
+msgstr "デフォルトのウィンドウ配置:"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7
-#, fuzzy
 msgid "C_ompositor"
-msgstr "コンポジット"
+msgstr "合成処理(_O)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8
-#, fuzzy
 msgid "C_ycling"
-msgstr "循環"
+msgstr "循環(_Y)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:9
-#, fuzzy
 msgid "Cycle _through windows on all workspaces"
-msgstr "全てのワークスペースを循環させる"
+msgstr "全てのワークスペースを循環させる(_T)"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:10
-#, fuzzy
 msgid "Display _fullscreen overlay windows directly"
-msgstr "全画面オーバーレイ表示する"
+msgstr "全画面オーバーレイウィンドウを直接表示する(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11
-#, fuzzy
 msgid "Do _nothing"
-msgstr "何もしない"
+msgstr "何もしない(_N)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12
-#, fuzzy
 msgid "Hide _frame of windows when maximized"
-msgstr "最大化する時はウィンドウの枠を隠す"
+msgstr "最大化する時はウィンドウの枠を隠す(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13
-#, fuzzy
 msgid "Honor _standard ICCCM focus hint"
-msgstr "ICCCM 標準フォーカスヒントに則る"
+msgstr "ICCCM 標準フォーカスヒントに則る(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14
 msgid "Keep urgent windows blinking"
-msgstr ""
+msgstr "緊急通知のあるウィンドウは点滅を続ける"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15
-#, fuzzy
 msgid "Key used to _grab and move windows:"
-msgstr "ウィンドウを掴んだり移動したりするために使うキー"
+msgstr "ウィンドウを掴んだり移動したりするために使うキー(_G):"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-#, fuzzy
 msgid "Opaci_ty of window decorations:"
-msgstr "ウィンドウ枠の透明度"
+msgstr "ウィンドウ枠の透明度(_T):"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
-#, fuzzy
 msgid "Opacity of _inactive windows:"
-msgstr "非アクティブ・ウィンドウの透明度"
+msgstr "非アクティブ・ウィンドウの透明度(_I):"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
-#, fuzzy
 msgid "Opacity of popup window_s:"
-msgstr "ポップアップウィンドウの透明度"
+msgstr "ポップアップウィンドウの透明度(_S):"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
-#, fuzzy
 msgid "Opacity of windows during _move:"
-msgstr "移動時のウィンドウの透明度"
+msgstr "移動中のウィンドウの透明度(_M):"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
-#, fuzzy
 msgid "Opacity of windows during resi_ze:"
-msgstr "大きさ変更時のウィンドウの透明度"
+msgstr "大きさ変更中のウィンドウの透明度(_Z):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
-#, fuzzy
 msgid "Restore original _size of maximized windows when moving"
-msgstr "移動する時は最大化されているウィンドウの大きさを元に戻す"
+msgstr "最大化されたウィンドウを移動する時は大きさを元に戻す(_S)"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
-#, fuzzy
 msgid "Show shadows under _dock windows"
-msgstr "ドックウィンドウの下に影を落とす"
+msgstr "ドックウィンドウに影を落とす(_D)"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
-#, fuzzy
 msgid "Show shadows under _regular windows"
-msgstr "通常のウィンドウに影を落とす"
+msgstr "通常のウィンドウに影を落とす(_R)"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24
-#, fuzzy
 msgid "Show shadows under pop_up windows"
-msgstr "ポップアップウィンドウに影を落とす"
+msgstr "ポップアップウィンドウに影を落とす(_U)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25
-#, fuzzy
 msgid "Size|<i>Large</i>"
-msgstr "大きい"
+msgstr "<i>大きい</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26
-#, fuzzy
 msgid "Size|<i>Small</i>"
-msgstr "小さい"
+msgstr "<i>小さい</i>"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27
-#, fuzzy
 msgid "Switch to win_dow's workspace"
-msgstr "ウィンドウのワークスペースを切り換える"
+msgstr "ウィンドウのワークスペースへ切り換える(_D)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 msgid "Under the mouse _pointer"
-msgstr ""
+msgstr "マウスポインタの下(_P)"
 
 # FIXME: should be revised
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29
-#, fuzzy
 msgid "Use _edge resistance instead of window snapping"
-msgstr "ウィンドウを止める代わりにエッジ抵抗を使用する"
+msgstr "ウィンドウを止める代わりにエッジ抵抗を使用する(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30
 msgid "When a window raises itself:"
-msgstr "ウィンドウ自身を前面に出す場合:"
+msgstr "ウィンドウ自身が前面に出る場合:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32
-#, fuzzy
 msgid "Wrap workspaces depending on the actual desktop _layout"
-msgstr "実際のデスクトップレイアウトに応じてワークスペースを循環する"
+msgstr "実際のデスクトップレイアウトに応じてワークスペースを循環する(_L)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33
-#, fuzzy
 msgid "Wrap workspaces when the _first or the last workspace is reached"
-msgstr "先頭または最後のワークスペースに来たら循環する"
+msgstr "先頭または最後のワークスペースに来たら循環する(_F)"
 
 # FIXME: i hate this transliteration
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34
-#, fuzzy
 msgid "_Accessibility"
-msgstr "アクセシビリティ"
+msgstr "アクセシビリティ(_A)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
-#, fuzzy
 msgid "_Bring window on current workspace"
-msgstr "ウィンドウを現在のワークスペースに移す"
+msgstr "ウィンドウを現在のワークスペースに移す(_B)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
 msgid "_Draw frame around selected windows while cycling"
-msgstr ""
+msgstr "循環中選択したウィンドウの枠を描画する(_D)"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37
-#, fuzzy
 msgid "_Enable display compositing"
-msgstr "合成処理を有効にする"
+msgstr "合成処理を有効にする(_E)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
-#, fuzzy
 msgid "_Focus"
-msgstr "フォーカス"
+msgstr "フォーカス(_F)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39
-#, fuzzy
 msgid "_Include hidden (i.e. iconified) windows"
-msgstr "アイコン化されているような隠しウィンドウも含める"
+msgstr "アイコン化されたなどの隠しウィンドウも含める(_I)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40
-#, fuzzy
 msgid "_Minimum size of windows to trigger smart placement:"
-msgstr "スマート配置を行うきっかけとなる最小のウィンドウサイズ"
+msgstr "スマート配置を行うきっかけとなる最小のウィンドウサイズ(_M):"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41
 msgid "_Mouse wheel over desktop switches workspaces"
-msgstr ""
+msgstr "デスクトップ上でマウスホイールを使用してワークスペースを切り替える(_M)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42
-#, fuzzy
 msgid "_Placement"
-msgstr "配置"
+msgstr "配置(_P)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43
-#, fuzzy
 msgid "_Raise windows when any mouse button is pressed"
-msgstr "いずれかのマウスボタンが押されている時にウィンドウを前面に出す"
+msgstr "いずれかのマウスボタンが押されている時にウィンドウを前面に出す(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44
-#, fuzzy
 msgid ""
 "_Remember and recall previous workspace\n"
 "when switching via keyboard shortcuts"
-msgstr "ショートカットを使用して切り替える時に以前のワークスペースを覚えておく"
+msgstr ""
+"ショートカットキーを使用して切り替える時に\n"
+"以前のワークスペースを覚えておく(_R)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46
-#, fuzzy
 msgid ""
 "_Skip windows that have \"skip pager\"\n"
 "or \"skip taskbar\" properties set"
 msgstr ""
-"「ページャーを飛ばす」または「タスクバーを飛ばす」というプロパティが設定され"
-"ているウィンドウを飛ばす"
+"「ページャーを飛ばす」または「タスクバーを飛ばす」というプロパティが\n"
+"設定されているウィンドウを飛ばす(_S)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48
-#, fuzzy
 msgid "_Workspaces"
-msgstr "ワークスペース"
+msgstr "ワークスペース(_W)"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:10
 #: ../settings-dialogs/xfwm4-dialog.glade.h:54
 msgid "gtk-close"
-msgstr ""
+msgstr "閉じる"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:11
 #: ../settings-dialogs/xfwm4-dialog.glade.h:55
 msgid "gtk-help"
-msgstr ""
+msgstr "ヘルプ"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Margins</b>"
-msgstr "余白"
+msgstr "<b>余白</b>"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Workspaces</b>"
-msgstr "ワークスペース循環"
+msgstr "<b>ワークスペース</b>"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3
-#, fuzzy
 msgid "Change Workspace Name"
-msgstr "ワークスペース名"
+msgstr "ワークスペース名の変更"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4
 msgid ""
@@ -692,24 +640,20 @@ msgid ""
 msgstr "余白とは画面端のウィンドウが置かれない空間のことです"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
-#, fuzzy
 msgid "_Name:"
-msgstr "名前:"
+msgstr "名前(_N):"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
-#, fuzzy
 msgid "_Number of workspaces:"
-msgstr "ワークスペースの数:"
+msgstr "ワークスペースの数(_N):"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:9
-#, fuzzy
 msgid "gtk-cancel"
 msgstr "キャンセル"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:12
-#, fuzzy
 msgid "gtk-save"
-msgstr "キャンセル"
+msgstr "保存"
 
 #: ../settings-dialogs/tweaks-settings.c:42
 msgid "None"
@@ -717,115 +661,97 @@ msgstr "無し"
 
 #: ../settings-dialogs/tweaks-settings.c:396
 msgid "Session manager socket"
-msgstr ""
+msgstr "セッションマネージャソケット"
 
 #: ../settings-dialogs/workspace-settings.c:72
 #: ../settings-dialogs/workspace-settings.c:87
 #: ../settings-dialogs/workspace-settings.c:148
 #, c-format
 msgid "Workspace %d"
-msgstr "ワークスペース %d へ移る"
+msgstr "Workspace %d"
 
 #: ../settings-dialogs/workspace-settings.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "Change the name of workspace %d"
-msgstr "ワークスペースの数:"
+msgstr "ワークスペース %d の名前を変更します"
 
 #: ../settings-dialogs/workspace-settings.c:275
-#, fuzzy
 msgid "Workspace Name"
 msgstr "ワークスペース名"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid "  "
-msgstr ""
+msgstr "  "
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Box move and resize</b>"
-msgstr "内容表示での移動と大きさ変更"
+msgstr "<b>移動とサイズ変更</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Button layout</b>"
-msgstr "ボタン配置"
+msgstr "<b>ボタンの配置</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
-#, fuzzy
 msgid "<b>Double click _action</b>"
-msgstr "ダブルクリック動作"
+msgstr "<b>ダブルクリック時の動作</b>(_A)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
-#, fuzzy
 msgid "<b>Focus model</b>"
-msgstr "フォーカスモデル"
+msgstr "<b>フォーカスモデル</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:6
-#, fuzzy
 msgid "<b>New window focus</b>"
-msgstr "新規ウィンドウのフォーカス"
+msgstr "<b>新規ウィンドウのフォーカス</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:7
-#, fuzzy
 msgid "<b>Raise on click</b>"
-msgstr "クリックで前面に出す"
+msgstr "<b>クリックで前面に出す</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:8
-#, fuzzy
 msgid "<b>Raise on focus</b>"
-msgstr "フォーカスで前面へ"
+msgstr "<b>フォーカスで前面へ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:9
-#, fuzzy
 msgid "<b>Title _alignment</b>"
-msgstr "タイトル位置"
+msgstr "<b>タイトルの位置</b>(_A)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:10
-#, fuzzy
 msgid "<b>Title fon_t</b>"
-msgstr "タイトルフォント"
+msgstr "<b>タイトルのフォント</b>(_T)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:11
-#, fuzzy
 msgid "<b>Window _shortcuts</b>"
-msgstr "ウィンドウショートカット"
+msgstr "<b>ウィンドウショートカットキー</b>(_S)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:12
-#, fuzzy
 msgid "<b>Windows snapping</b>"
-msgstr "ウィンドウスナップ"
+msgstr "<b>ウィンドウのスナップ</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:13
-#, fuzzy
 msgid "<b>Wrap workspaces</b>"
-msgstr "ワークスペース循環"
+msgstr "<b>ワークスペースの循環</b>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:14
 msgid "Active"
 msgstr "アクティブ"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:15
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "詳細"
+msgstr "詳細(_V)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:16
-#, fuzzy
 msgid "Automatically _raise windows when they receive focus"
-msgstr "ウィンドウがフォーカスを取得した場合自動的に前面に出す"
+msgstr "ウィンドウがフォーカスを取得した場合自動的に前面に出す(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:17
-#, fuzzy
 msgid "Automatically give focus to _newly created windows"
-msgstr "新規作成されたウィンドウに自動的にフォーカスを当てる"
+msgstr "新規作成されたウィンドウに自動的にフォーカスを移動する(_N)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:18
-#, fuzzy
 msgid "Clic_k to focus"
-msgstr "クリックでフォーカス"
+msgstr "クリックでフォーカス(_K)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:19
-#, fuzzy
 msgid "Click and drag the buttons to change the layout"
 msgstr "レイアウトを変更するにはボタンをクリック＆ドラッグしてください"
 
@@ -834,37 +760,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:22
-#, fuzzy
 msgid "Delay _before raising focused window:"
-msgstr "フォーカス取得後、前面に出すまでの遅延時間 :"
+msgstr "フォーカス取得後、前面に出すまでの遅延時間(_B):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:23
 msgid "Delay|<i>Long</i>"
-msgstr ""
+msgstr "<i>長い</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:24
 msgid "Delay|<i>Short</i>"
-msgstr ""
+msgstr "<i>短い</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:25
-#, fuzzy
 msgid "Dis_tance:"
-msgstr "距離 :"
+msgstr "距離(_T):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:26
-#, fuzzy
 msgid "Distance|<i>Small</i>"
-msgstr "短い"
+msgstr "<i>小さい</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:27
-#, fuzzy
 msgid "Distance|<i>Wide</i>"
-msgstr "長い"
+msgstr "<i>大きい</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:28
-#, fuzzy
 msgid "Focus follows _mouse"
-msgstr "マウスに従ってフォーカス"
+msgstr "マウスに従ってフォーカス(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:29
 msgid "Hidden"
@@ -876,19 +797,16 @@ msgid "Hide"
 msgstr "隠す"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:31
-#, fuzzy
 msgid "Hide content of windows when _moving"
-msgstr "移動時にウィンドウの内容を表示する"
+msgstr "移動時にウィンドウの内容を表示しない(_M)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
-#, fuzzy
 msgid "Hide content of windows when _resizing"
-msgstr "大きさ変更時にウィンドウの内容を表示する"
+msgstr "大きさ変更時にウィンドウの内容を表示しない(_R)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
-#, fuzzy
 msgid "Ke_yboard"
-msgstr "キーボード"
+msgstr "キーボード(_Y)"
 
 # FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:34
@@ -900,19 +818,16 @@ msgid "Menu"
 msgstr "メニュー"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:36
-#, fuzzy
 msgid "Raise window when clicking _inside application window"
-msgstr "アプリケーションウィンドウ内でクリックした場合前面に出す"
+msgstr "アプリケーションウィンドウ内でクリックした場合前面に出す(_I)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:37
-#, fuzzy
 msgid "Resistance|<i>Small</i>"
-msgstr "弱い"
+msgstr "<i>小さい</i>"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:38
-#, fuzzy
 msgid "Resistance|<i>Wide</i>"
-msgstr "強い"
+msgstr "<i>大きい</i>"
 
 # FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:39
@@ -920,14 +835,12 @@ msgid "Shade"
 msgstr "折り畳む"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:40
-#, fuzzy
 msgid "Snap windows to other _windows"
-msgstr "他のウィンドウでウィンドウを止める"
+msgstr "他のウィンドウでウィンドウを止める(_W)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:41
-#, fuzzy
 msgid "Snap windows to screen _border"
-msgstr "画面の境界でウィンドウを止める"
+msgstr "画面の境界でウィンドウを止める(_B)"
 
 # FIXME:
 #: ../settings-dialogs/xfwm4-dialog.glade.h:42
@@ -935,310 +848,45 @@ msgid "Stick"
 msgstr "貼る"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:43
-#, fuzzy
 msgid "The action to perform when the title-bar is double-clicked"
-msgstr "タイトルバーをダブルクリックした時の動作 :"
+msgstr "タイトルバーをダブルクリックした時の動作"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:44
 msgid "The window title, it cannot be removed"
-msgstr "ウィンドウタイトル、削除できません"
+msgstr "ウィンドウタイトル - 削除できません"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 msgid "Title"
 msgstr "タイトル"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
-#, fuzzy
 msgid "Wrap workspaces when _dragging a window off the screen"
-msgstr "画面でウィンドウをドラッグするとワークスペースを循環する"
+msgstr "画面でウィンドウをドラッグするとワークスペースを循環する(_D)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:48
-#, fuzzy
 msgid "Wrap workspaces when the _pointer reaches the screen edge"
-msgstr "ポインタが画面端に来たらワークスペースを循環する"
+msgstr "ポインタが画面端に来たらワークスペースを循環する(_P)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
-#, fuzzy
 msgid "_Delay before window receives focus:"
-msgstr "ウィンドウがフォーカスされるまでの遅延時間"
+msgstr "ウィンドウがフォーカスされるまでの遅延時間(_D)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
-#, fuzzy
 msgid "_Edge resistance:"
-msgstr "エッジ抵抗 :"
+msgstr "エッジ抵抗(_E):"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:52
-#, fuzzy
 msgid "_Style"
-msgstr "スタイル"
+msgstr "スタイル(_S)"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:53
-#, fuzzy
 msgid "gtk-clear"
-msgstr "キャンセル"
+msgstr "クリア"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:56
 msgid "gtk-revert-to-saved"
-msgstr ""
+msgstr "元に戻す"
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:57
 msgid "gtk-select-all"
-msgstr ""
-
-#~ msgid "Window operations menu"
-#~ msgstr "ウィンドウ操作メニュー"
-
-#~ msgid "Cancel"
-#~ msgstr "キャンセル"
-
-#~ msgid "Cycle windows"
-#~ msgstr "ウィンドウを循環する"
-
-#~ msgid "Close window"
-#~ msgstr "ウィンドウを閉じる"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "ウィンドウを横に最大化する"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "ウィンドウを縦に最大化する"
-
-#, fuzzy
-#~ msgid "Move window"
-#~ msgstr "ウィンドウを上に移動する"
-
-#, fuzzy
-#~ msgid "Resize window"
-#~ msgstr "ウィンドウを縦に縮める"
-
-#~ msgid "Stick window"
-#~ msgstr "ウィンドウを貼り付ける"
-
-#~ msgid "Raise window"
-#~ msgstr "ウィンドウを前面に出す"
-
-#~ msgid "Lower window"
-#~ msgstr "ウィンドウを背面に隠す"
-
-#~ msgid "Fill window horizontally"
-#~ msgstr "ウィンドウを横に最大化する"
-
-#~ msgid "Fill window vertically"
-#~ msgstr "ウィンドウを縦に最大化する"
-
-#~ msgid "Toggle above"
-#~ msgstr "上で切り替える"
-
-#~ msgid "Toggle fullscreen"
-#~ msgstr "全画面に切替える"
-
-#~ msgid "Move window to upper workspace"
-#~ msgstr "ウィンドウを上のワークスペースに移す"
-
-#~ msgid "Move window to bottom workspace"
-#~ msgstr "ウィンドウを下のワークスペースに移す"
-
-#~ msgid "Move window to left workspace"
-#~ msgstr "ウィンドウを左のワークスペースに移す"
-
-#~ msgid "Move window to right workspace"
-#~ msgstr "ウィンドウを右のワークスペースに移す"
-
-#~ msgid "Move window to previous workspace"
-#~ msgstr "ウィンドウを前のワークスペースに移す"
-
-#~ msgid "Move window to next workspace"
-#~ msgstr "ウィンドウを次のワークスペースに移す"
-
-#~ msgid "Show desktop"
-#~ msgstr "デスクトップを表示する"
-
-#~ msgid "Upper workspace"
-#~ msgstr "上のワークスペースへ移る"
-
-#~ msgid "Bottom workspace"
-#~ msgstr "下のワークスペースへ移る"
-
-#~ msgid "Left workspace"
-#~ msgstr "左のワークスペースへ移る"
-
-#~ msgid "Right workspace"
-#~ msgstr "右のワークスペースへ移る"
-
-#~ msgid "Previous workspace"
-#~ msgstr "前のワークスペースへ移る"
-
-#~ msgid "Next workspace"
-#~ msgstr "次のワークスペースへ移る"
-
-#~ msgid "Add workspace"
-#~ msgstr "ワークスペースを追加する"
-
-#, fuzzy
-#~ msgid "Add adjacent workspace"
-#~ msgstr "ワークスペースを追加する"
-
-#, fuzzy
-#~ msgid "Delete last workspace"
-#~ msgstr "ワークスペースを削除する"
-
-#, fuzzy
-#~ msgid "Delete active workspace"
-#~ msgstr "ワークスペースを削除する"
-
-#, fuzzy
-#~ msgid "Action"
-#~ msgstr "アクティブ"
-
-#, fuzzy
-#~ msgid "Shortcut"
-#~ msgstr "ショートカット無し"
-
-#, fuzzy
-#~ msgid "Ctrl"
-#~ msgstr "中央"
-
-#, fuzzy
-#~ msgid "Button"
-#~ msgstr "ボタン配置"
-
-#~ msgid "A keybinding theme with the same name already exists"
-#~ msgstr "同じ名前のキー割り当てテーマが既に存在します"
-
-#~ msgid "You have to provide a name for the keybinding theme"
-#~ msgstr "キー割り当てテーマの名前を指定する必要があります"
-
-#~ msgid "Do you really want to remove this keybinding theme ?"
-#~ msgstr "本当にこのキー割り当てテーマを削除しますか？"
-
-#, fuzzy
-#~ msgid "Add Shortcut Theme"
-#~ msgstr "ショートカット"
-
-#, fuzzy
-#~ msgid "Type the name for the new shortcut theme:"
-#~ msgstr "テーマの名前を入力:"
-
-#~ msgid "Workspace Margins"
-#~ msgstr "ワークスペースの余白"
-
-#~ msgid "Left :"
-#~ msgstr "å·¦ :"
-
-#~ msgid "Right :"
-#~ msgstr "右 :"
-
-#~ msgid "Top :"
-#~ msgstr "上 :"
-
-#~ msgid "Bottom :"
-#~ msgstr "下 :"
-
-#~ msgid "Button Label|Workspaces and Margins"
-#~ msgstr "ワークスペースと余白"
-
-#~ msgid "Workspaces and Margins"
-#~ msgstr "ワークスペースと余白"
-
-#~ msgid "Place window under the mouse"
-#~ msgstr "ウィンドウをマウスの下に配置する"
-
-#~ msgid "Place window in the center"
-#~ msgstr "ウィンドウを中央に配置する"
-
-#~ msgid "Switch workspaces using the mouse wheel over the desktop"
-#~ msgstr ""
-#~ "デスクトップ上でマウスホイールを使用しながらワークスペースを切り替える"
-
-#~ msgid "Default positionning of windows without smart placement:"
-#~ msgstr "スマート配置を行わない場合のウィンドウの既定位置:"
-
-#~ msgid "Button Label|Window Manager Tweaks"
-#~ msgstr "ウィンドウマネージャー (詳細)"
-
-#~ msgid "These settings cannot work with your current window manager (%s)"
-#~ msgstr ""
-#~ "現在のウィンドウマネージャー (%s) ではこれらの設定が有効になりません"
-
-#~ msgid "Change name"
-#~ msgstr "名前変更"
-
-#~ msgid "Click on a workspace name to edit it"
-#~ msgstr "編集するにはワークスペース名をクリックしてください"
-
-#~ msgid "Font Selection Dialog"
-#~ msgstr "フォント選択ダイアログ"
-
-#~ msgid "Text alignment inside title bar :"
-#~ msgstr "タイトルバー内のテキスト位置 :"
-
-#~ msgid "Slow"
-#~ msgstr "遅い"
-
-#~ msgid "Fast"
-#~ msgstr "速い"
-
-#~ msgid "Button Label|Window Manager"
-#~ msgstr "ウィンドウマネージャー"
-
-#~ msgid "Add keybinding theme"
-#~ msgstr "キー割り当てテーマを追加"
-
-#~ msgid "Move window to workspace %d"
-#~ msgstr "ウィンドウをワークスペース %d に移す"
-
-#~ msgid "Cannot open the theme directory !"
-#~ msgstr "テーマフォルダを開けません！"
-
-#~ msgid ""
-#~ "Cannot open %s : \n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s を開けません : \n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Cannot write in %s : \n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s に書き込めません : \n"
-#~ "%s"
-
-#~ msgid "Compose shortcut for :"
-#~ msgstr "ショートカットを編集 :"
-
-#~ msgid "Compose shortcut"
-#~ msgstr "ショートカットを編集"
-
-#~ msgid "Advanced Configuration"
-#~ msgstr "ウィンドウマネージャーの高度な設定を行います"
-
-#~ msgid "Move window down"
-#~ msgstr "ウィンドウを下に移動する"
-
-#~ msgid "Move window left"
-#~ msgstr "ウィンドウを左に移動する"
-
-#~ msgid "Move window right"
-#~ msgstr "ウィンドウを右に移動する"
-
-#~ msgid "Resize window down"
-#~ msgstr "ウィンドウを縦に伸ばす"
-
-#~ msgid "Resize window left"
-#~ msgstr "ウィンドウを横に縮める"
-
-#~ msgid "Resize window right"
-#~ msgstr "ウィンドウを横に伸ばす"
-
-#~ msgid "Cancel move/resize window"
-#~ msgstr "ウィンドウの移動/リサイズをキャンセル"
-
-#~ msgid "Un_maximize"
-#~ msgstr "元に戻す(_M)"
-
-#~ msgid "_Hide"
-#~ msgstr "隠す(_H)"
-
-#~ msgid "Always on top"
-#~ msgstr "常に前面へ"
+msgstr "全て選択"
-- 
GitLab