diff --git a/po/en_GB.po b/po/en_GB.po
index 3626b7a22fbf7588b3ecf4f415122092f70bd412..70999dbe4fd7242e454f9bb78c303dc9aff166da 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2004-2007 Benedikt Meurer.
 # This file is distributed under the same license as the thunar package.
 # Jeff Bailes <thepizzaking@gmail.com>, 2007.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-01 21:53+0100\n"
+"POT-Creation-Date: 2012-11-04 05:12+0000\n"
 "PO-Revision-Date: 2009-01-27 12:46+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English/GB <xfce-i18n@xfce.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../thunar/main.c:61
@@ -639,7 +639,7 @@ msgstr "_Retry"
 
 #: ../thunar/thunar-dialogs.c:445
 msgid "Copy _Anyway"
-msgstr ""
+msgstr "Copy _Anyway"
 
 #: ../thunar/thunar-dialogs.c:468
 msgid "_Cancel"
@@ -693,9 +693,8 @@ msgstr "Do you want to replace the existing folder"
 msgid "ReplaceDialogPart1|Do you want to replace the existing file"
 msgstr "Do you want to replace the existing file"
 
-#.
 #. Fourth box (size, volume, free space)
-#.
+#. 
 #: ../thunar/thunar-dialogs.c:618 ../thunar/thunar-dialogs.c:649
 #: ../thunar/thunar-properties-dialog.c:464
 msgid "Size:"
@@ -723,16 +722,15 @@ msgstr "with the following file?"
 msgid ""
 "The desktop file \"%s\" is in an insecure location and not marked as "
 "executable. If you do not trust this program, click Cancel."
-msgstr ""
+msgstr "The desktop file \"%s\" is in an insecure location and not marked as executable. If you do not trust this program, click Cancel."
 
 #: ../thunar/thunar-dialogs.c:777
 msgid "_Launch Anyway"
-msgstr ""
+msgstr "_Launch Anyway"
 
 #: ../thunar/thunar-dialogs.c:779
-#, fuzzy
 msgid "Mark _Executable"
-msgstr "_Execute"
+msgstr "Mark _Executable"
 
 #: ../thunar/thunar-dnd.c:72
 msgid "_Copy here"
@@ -792,9 +790,8 @@ msgstr "Name"
 msgid "Owner"
 msgstr "Owner"
 
-#.
 #. Permissions chooser
-#.
+#. 
 #: ../thunar/thunar-enum-types.c:98 ../thunar/thunar-properties-dialog.c:536
 msgid "Permissions"
 msgstr "Permissions"
@@ -832,9 +829,8 @@ msgstr "Failed to parse the desktop file: %s"
 
 #. if the .desktop file is not secure, ask user what to do
 #: ../thunar/thunar-file.c:1331
-#, fuzzy
 msgid "Untrusted application launcher"
-msgstr "No application selected"
+msgstr "Untrusted application launcher"
 
 #: ../thunar/thunar-file.c:1356
 #, c-format
@@ -844,7 +840,7 @@ msgstr "No Exec field specified"
 #. if the .desktop file is not secure, ask user what to do
 #: ../thunar/thunar-file.c:1365
 msgid "Untrusted link launcher"
-msgstr ""
+msgstr "Untrusted link launcher"
 
 #: ../thunar/thunar-file.c:1381
 #, c-format
@@ -859,12 +855,12 @@ msgstr "Invalid desktop file"
 #: ../thunar/thunar-gio-extensions.c:311
 #, c-format
 msgid "%s on %s"
-msgstr ""
+msgstr "%s on %s"
 
 #. extend history tooltip with function of the button
 #: ../thunar/thunar-history-action.c:372
 msgid "Right-click or pull down to show history"
-msgstr ""
+msgstr "Right-click or pull down to show history"
 
 #. create the "back" action
 #: ../thunar/thunar-history.c:163
@@ -886,12 +882,12 @@ msgstr "Go to the next visited folder"
 
 #: ../thunar/thunar-history.c:352
 msgid "The item will be removed from the history"
-msgstr ""
+msgstr "The item will be removed from the history"
 
 #: ../thunar/thunar-history.c:355
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find \"%s\""
-msgstr "Could not restore \"%s\""
+msgstr "Could not find \"%s\""
 
 #: ../thunar/thunar-icon-view.c:164
 msgid "Icon based directory listing"
@@ -1019,7 +1015,7 @@ msgstr "Do you want to skip it?"
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
-msgstr ""
+msgstr "There is not enough space on the destination. Try to remove files to make space."
 
 #. * CASE 1: nothing selected or atleast one directory in the selection
 #. **
@@ -1036,16 +1032,14 @@ msgstr "_Open"
 #. append the "Open in New Tab" menu action
 #: ../thunar/thunar-launcher.c:174 ../thunar/thunar-launcher.c:832
 #: ../thunar/thunar-tree-view.c:1122
-#, fuzzy
 msgid "Open in New _Tab"
-msgstr "Open in New Window"
+msgstr "Open in New _Tab"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:175 ../thunar/thunar-launcher.c:826
 #: ../thunar/thunar-tree-view.c:1129
-#, fuzzy
 msgid "Open in New _Window"
-msgstr "Open in New Window"
+msgstr "Open in New _Window"
 
 #: ../thunar/thunar-launcher.c:176 ../thunar/thunar-launcher.c:178
 msgid "Open With Other _Application..."
@@ -1089,11 +1083,11 @@ msgstr[1] "Open %d New Windows"
 
 #. turn "Open New Window" into "Open in n New Windows"
 #: ../thunar/thunar-launcher.c:799
-#, fuzzy, c-format
+#, c-format
 msgid "Open in %d New _Window"
 msgid_plural "Open in %d New _Windows"
-msgstr[0] "Open in %d New Window"
-msgstr[1] "Open in %d New Windows"
+msgstr[0] "Open in %d New _Window"
+msgstr[1] "Open in %d New _Windows"
 
 #: ../thunar/thunar-launcher.c:800
 #, c-format
@@ -1104,33 +1098,31 @@ msgstr[1] "Open the selected directory in %d new windows"
 
 #. turn "Open in New Tab" into "Open in x New Tabs"
 #: ../thunar/thunar-launcher.c:811
-#, fuzzy, c-format
+#, c-format
 msgid "Open in %d New _Tab"
 msgid_plural "Open in %d New _Tabs"
-msgstr[0] "Open in %d New Window"
-msgstr[1] "Open in %d New Windows"
+msgstr[0] "Open in %d New _Tab"
+msgstr[1] "Open in %d New _Tabs"
 
 #: ../thunar/thunar-launcher.c:812
-#, fuzzy, c-format
+#, c-format
 msgid "Open the selected directory in %d new tab"
 msgid_plural "Open the selected directories in %d new tabs"
-msgstr[0] "Open the selected directory in %d new window"
-msgstr[1] "Open the selected directory in %d new windows"
+msgstr[0] "Open the selected directory in %d new tab"
+msgstr[1] "Open the selected directories in %d new tabs"
 
 #: ../thunar/thunar-launcher.c:827
 msgid "Open the selected directory in a new window"
 msgstr "Open the selected directory in a new window"
 
 #: ../thunar/thunar-launcher.c:833
-#, fuzzy
 msgid "Open the selected directory in a new tab"
-msgstr "Open the selected directory in a new window"
+msgstr "Open the selected directory in a new tab"
 
 #. set tooltip that makes sence
 #: ../thunar/thunar-launcher.c:837
-#, fuzzy
 msgid "Open the selected directory"
-msgstr "Open the selected file"
+msgstr "Open the selected directory"
 
 #: ../thunar/thunar-launcher.c:858
 msgid "Open the selected file"
@@ -1253,14 +1245,16 @@ msgid "\"%s\" (%s) %s"
 msgstr "\"%s\" (%s) %s"
 
 #: ../thunar/thunar-list-model.c:2343
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" %s"
-msgstr "\"%s\" (%s) %s"
+msgstr "\"%s\" %s"
 
-#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
-#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. TRANSLATORS: Try to come up with a short translation of "Original Path"
+#. (which is the path
+#. * where the trashed file/folder was located before it was moved to the
+#. trash), otherwise the
 #. * properties dialog width will be messed up.
-#.
+#. 
 #: ../thunar/thunar-list-model.c:2353 ../thunar/thunar-properties-dialog.c:372
 msgid "Original Path:"
 msgstr "Original Path:"
@@ -1273,11 +1267,11 @@ msgstr "Image Size:"
 
 #. item count if there are also folders in the selection
 #: ../thunar/thunar-list-model.c:2406
-#, fuzzy, c-format
+#, c-format
 msgid "%d other item selected (%s)"
 msgid_plural "%d other items selected (%s)"
-msgstr[0] "%d item selected (%s)"
-msgstr[1] "%d items selected (%s)"
+msgstr[0] "%d other item selected (%s)"
+msgstr[1] "%d other items selected (%s)"
 
 #. only non-folders are selected
 #: ../thunar/thunar-list-model.c:2413
@@ -1288,11 +1282,11 @@ msgstr[0] "%d item selected (%s)"
 msgstr[1] "%d items selected (%s)"
 
 #: ../thunar/thunar-list-model.c:2427
-#, fuzzy, c-format
+#, c-format
 msgid "%d folder selected"
 msgid_plural "%d folders selected"
-msgstr[0] "%d item selected"
-msgstr[1] "%d items selected"
+msgstr[0] "%d folder selected"
+msgstr[1] "%d folders selected"
 
 #. This is marked for translation in case a localizer
 #. * needs to change ", " to something else. The comma
@@ -1301,7 +1295,7 @@ msgstr[1] "%d items selected"
 #: ../thunar/thunar-list-model.c:2446
 #, c-format
 msgid "%s, %s"
-msgstr ""
+msgstr "%s, %s"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-location-buttons.c:169
@@ -1434,23 +1428,20 @@ msgid "Owner:"
 msgstr "Owner:"
 
 #: ../thunar/thunar-permissions-chooser.c:237
-#, fuzzy
 msgid "_Access:"
-msgstr "Access:"
+msgstr "_Access:"
 
 #: ../thunar/thunar-permissions-chooser.c:261
 msgid "Gro_up:"
-msgstr ""
+msgstr "Gro_up:"
 
 #: ../thunar/thunar-permissions-chooser.c:280
-#, fuzzy
 msgid "Acce_ss:"
-msgstr "Access:"
+msgstr "Acce_ss:"
 
 #: ../thunar/thunar-permissions-chooser.c:304
-#, fuzzy
 msgid "O_thers:"
-msgstr "Others:"
+msgstr "O_thers:"
 
 #: ../thunar/thunar-permissions-chooser.c:328
 msgid "Program:"
@@ -1477,9 +1468,8 @@ msgstr ""
 "may not be able to work with files in this folder."
 
 #: ../thunar/thunar-permissions-chooser.c:382
-#, fuzzy
 msgid "Correct _folder permissions..."
-msgstr "Correct folder permissions..."
+msgstr "Correct _folder permissions..."
 
 #: ../thunar/thunar-permissions-chooser.c:383
 msgid "Click here to automatically fix the folder permissions."
@@ -1525,9 +1515,8 @@ msgstr ""
 "afterwards."
 
 #: ../thunar/thunar-permissions-chooser.c:914
-#, fuzzy
 msgid "Mixed file owners"
-msgstr "Unknown file owner"
+msgstr "Mixed file owners"
 
 #: ../thunar/thunar-permissions-chooser.c:914
 msgid "Unknown file owner"
@@ -1554,16 +1543,15 @@ msgstr "Read & Write"
 
 #: ../thunar/thunar-permissions-chooser.c:999
 msgid "Varying (no change)"
-msgstr ""
+msgstr "Varying (no change)"
 
 #: ../thunar/thunar-permissions-chooser.c:1131
 msgid "Correct folder permissions automatically?"
 msgstr "Correct folder permissions automatically?"
 
 #: ../thunar/thunar-permissions-chooser.c:1133
-#, fuzzy
 msgid "Correct _folder permissions"
-msgstr "Correct folder permissions"
+msgstr "Correct _folder permissions"
 
 #: ../thunar/thunar-permissions-chooser.c:1135
 msgid ""
@@ -1579,9 +1567,8 @@ msgstr ""
 msgid "File Manager Preferences"
 msgstr "File Manager Preferences"
 
-#.
 #. Display
-#.
+#. 
 #: ../thunar/thunar-preferences-dialog.c:207
 msgid "Display"
 msgstr "Display"
@@ -1653,9 +1640,8 @@ msgstr "Date"
 msgid "_Format:"
 msgstr "_Format:"
 
-#.
 #. Side Pane
-#.
+#. 
 #: ../thunar/thunar-preferences-dialog.c:318
 msgid "Side Pane"
 msgstr "Side Pane"
@@ -1736,9 +1722,8 @@ msgstr ""
 "Select this option to display icon emblems in the tree pane for all folders "
 "for which emblems have been defined in the folders properties dialogue."
 
-#.
 #. Behavior
-#.
+#. 
 #: ../thunar/thunar-preferences-dialog.c:412
 msgid "Behavior"
 msgstr "Behaviour"
@@ -1791,21 +1776,18 @@ msgstr "_Double click to activate items"
 
 #: ../thunar/thunar-preferences-dialog.c:512
 msgid "Middle Click"
-msgstr ""
+msgstr "Middle Click"
 
 #: ../thunar/thunar-preferences-dialog.c:522
-#, fuzzy
 msgid "Open folder in new _window"
-msgstr "Open \"%s\" in a new window"
+msgstr "Open folder in new _window"
 
 #: ../thunar/thunar-preferences-dialog.c:527
-#, fuzzy
 msgid "Open folder in new _tab"
-msgstr "Open Folder with Thunar"
+msgstr "Open folder in new _tab"
 
-#.
 #. Advanced
-#.
+#. 
 #: ../thunar/thunar-preferences-dialog.c:536
 msgid "Advanced"
 msgstr "Advanced"
@@ -1853,7 +1835,8 @@ msgstr ""
 "<a href=\"volman-config:\">Configure</a> the management of removable drives\n"
 "and media (i.e. how cameras should be handled)."
 
-#. tell the user that we failed to come up with the thunar-volman configuration dialog
+#. tell the user that we failed to come up with the thunar-volman
+#. configuration dialog
 #: ../thunar/thunar-preferences-dialog.c:663
 msgid "Failed to display the volume management settings"
 msgstr "Failed to display the volume management settings"
@@ -1885,34 +1868,29 @@ msgid "_Name:"
 msgstr "_Name:"
 
 #: ../thunar/thunar-properties-dialog.c:291
-#, fuzzy
 msgid "Names:"
-msgstr "Name:"
+msgstr "Names:"
 
-#.
 #. Second box (kind, open with, link target)
-#.
+#. 
 #: ../thunar/thunar-properties-dialog.c:318
 msgid "Kind:"
 msgstr "Kind:"
 
 #: ../thunar/thunar-properties-dialog.c:340
-#, fuzzy
 msgid "_Open With:"
-msgstr "Open With:"
+msgstr "_Open With:"
 
 #: ../thunar/thunar-properties-dialog.c:354
 msgid "Link Target:"
 msgstr "Link Target:"
 
 #: ../thunar/thunar-properties-dialog.c:386
-#, fuzzy
 msgid "Location:"
-msgstr "_Location:"
+msgstr "Location:"
 
-#.
 #. Third box (deleted, modified, accessed)
-#.
+#. 
 #: ../thunar/thunar-properties-dialog.c:411
 msgid "Deleted:"
 msgstr "Deleted:"
@@ -1929,9 +1907,8 @@ msgstr "Volume:"
 msgid "Free Space:"
 msgstr "Free Space:"
 
-#.
 #. Emblem chooser
-#.
+#. 
 #: ../thunar/thunar-properties-dialog.c:526
 msgid "Emblems"
 msgstr "Emblems"
@@ -1966,17 +1943,16 @@ msgstr "unknown"
 #: ../thunar/thunar-properties-dialog.c:1054
 #, c-format
 msgid "%s of %s (%d%% used)"
-msgstr ""
+msgstr "%s of %s (%d%% used)"
 
 #. update the properties dialog title
 #: ../thunar/thunar-properties-dialog.c:1117
-#, fuzzy
 msgid "Properties"
-msgstr "_Properties..."
+msgstr "Properties"
 
 #: ../thunar/thunar-properties-dialog.c:1217
 msgid "mixed"
-msgstr ""
+msgstr "mixed"
 
 #: ../thunar/thunar-renamer-dialog.c:186 ../thunar/thunar-window.c:336
 msgid "_File"
@@ -2044,9 +2020,11 @@ msgid "Click here to view the documentation for the selected rename operation."
 msgstr ""
 "Click here to view the documentation for the selected rename operation."
 
-#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-2/,
-#. *              and opening the multi rename dialog by selecting multiple files and pressing F2.
-#.
+#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.*
+#. from $libdir/thunarx-2/,
+#. *              and opening the multi rename dialog by selecting multiple
+#. files and pressing F2.
+#. 
 #: ../thunar/thunar-renamer-dialog.c:607
 msgid ""
 "No renamer modules were found on your system. Please check your\n"
@@ -2142,20 +2120,19 @@ msgstr ""
 
 #: ../thunar/thunar-shortcuts-model.c:801
 msgid "DEVICES"
-msgstr ""
+msgstr "DEVICES"
 
 #: ../thunar/thunar-shortcuts-model.c:847
 msgid "NETWORK"
-msgstr ""
+msgstr "NETWORK"
 
 #: ../thunar/thunar-shortcuts-model.c:853
-#, fuzzy
 msgid "Browse Network"
-msgstr "Browse the network"
+msgstr "Browse Network"
 
 #: ../thunar/thunar-shortcuts-model.c:874
 msgid "PLACES"
-msgstr ""
+msgstr "PLACES"
 
 #: ../thunar/thunar-shortcuts-pane.c:362
 msgid "Side Pane (Create Shortcut)"
@@ -2171,41 +2148,37 @@ msgstr[1] "Add the selected folders to the shortcuts side pane"
 
 #. append the "Open in New Tab" menu action
 #: ../thunar/thunar-shortcuts-view.c:1087
-#, fuzzy
 msgid "Open in New Tab"
-msgstr "Open in New Window"
+msgstr "Open in New Tab"
 
 #. append the "Mount" item
 #. append the "Mount" menu action
 #: ../thunar/thunar-shortcuts-view.c:1107 ../thunar/thunar-tree-view.c:1145
-#, fuzzy
 msgid "_Mount"
-msgstr "_Mount Volume"
+msgstr "_Mount"
 
 #. append the "Unmount" item
 #. append the "Unmount" menu action
 #: ../thunar/thunar-shortcuts-view.c:1113 ../thunar/thunar-tree-view.c:1151
-#, fuzzy
 msgid "_Unmount"
-msgstr "_Unmount Volume"
+msgstr "_Unmount"
 
 #. append the "Disconnect" (eject + safely remove drive) item
 #. append the "Eject" menu action
 #: ../thunar/thunar-shortcuts-view.c:1119 ../thunar/thunar-tree-view.c:1157
 msgid "_Eject"
-msgstr ""
+msgstr "_Eject"
 
 #. append the "Disconnect" item
 #: ../thunar/thunar-shortcuts-view.c:1136
-#, fuzzy
 msgid "Create _Shortcut"
-msgstr "Re_name Shortcut"
+msgstr "Create _Shortcut"
 
 #. append the "Disconnect" item
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:1157 ../thunar/thunar-tree-view.c:1166
 msgid "Disconn_ect"
-msgstr ""
+msgstr "Disconn_ect"
 
 #: ../thunar/thunar-shortcuts-view.c:1237
 msgid "_Remove Shortcut"
@@ -2261,15 +2234,13 @@ msgstr[1] "%u items, totalling %s"
 #. TRANSLATORS: this is shows if during the deep count size
 #. * directories were not accessible
 #: ../thunar/thunar-size-label.c:385
-#, fuzzy
 msgid "(some contents unreadable)"
-msgstr "Show the contents in more detail"
+msgstr "(some contents unreadable)"
 
 #. nothing was readable, so permission was denied
 #: ../thunar/thunar-size-label.c:396
-#, fuzzy
 msgid "Permission denied"
-msgstr "Permissions"
+msgstr "Permission denied"
 
 #: ../thunar/thunar-standard-view.c:381
 msgid "Folder Context Menu"
@@ -2299,9 +2270,8 @@ msgstr "Move or copy files previously selected by a Cut or Copy command"
 
 #. append the "Move to Tash" menu action
 #: ../thunar/thunar-standard-view.c:387 ../thunar/thunar-tree-view.c:1270
-#, fuzzy
 msgid "Mo_ve to Trash"
-msgstr "_Empty Wastebasket"
+msgstr "Mo_ve to Wastebasket"
 
 #. append the "Delete" menu action
 #: ../thunar/thunar-standard-view.c:388 ../thunar/thunar-tree-view.c:1282
@@ -2334,11 +2304,11 @@ msgstr "Select all files that match a certain pattern"
 
 #: ../thunar/thunar-standard-view.c:392
 msgid "_Invert Selection"
-msgstr ""
+msgstr "_Invert Selection"
 
 #: ../thunar/thunar-standard-view.c:392
 msgid "Select all and only the items that are not currently selected"
-msgstr ""
+msgstr "Select all and only the items that are not currently selected"
 
 #: ../thunar/thunar-standard-view.c:393
 msgid "Du_plicate"
@@ -2393,7 +2363,8 @@ msgstr "_Select"
 msgid "_Pattern:"
 msgstr "_Pattern:"
 
-#. tell the user that the file name provided by the X Direct Save source is invalid
+#. tell the user that the file name provided by the X Direct Save source is
+#. invalid
 #: ../thunar/thunar-standard-view.c:3003
 msgid "Invalid filename provided by XDS drag site"
 msgstr "Invalid filename provided by XDS drag site"
@@ -2422,18 +2393,16 @@ msgstr[0] "Prepare the selected file to be copied with a Paste command"
 msgstr[1] "Prepare the selected files to be copied with a Paste command"
 
 #: ../thunar/thunar-standard-view.c:4092
-#, fuzzy
 msgid "Move the selected file to the Trash"
 msgid_plural "Move the selected files to the Trash"
-msgstr[0] "Send the selected file to \"%s\""
-msgstr[1] "Send the selected files to \"%s\""
+msgstr[0] "Move the selected file to the Wastebasket"
+msgstr[1] "Move the selected files to the Wastebasket"
 
 #: ../thunar/thunar-standard-view.c:4100
-#, fuzzy
 msgid "Permanently delete the selected file"
 msgid_plural "Permanently delete the selected files"
-msgstr[0] "Delete the selected file"
-msgstr[1] "Delete the selected files"
+msgstr[0] "Permanently delete the selected file"
+msgstr[1] "Permanently delete the selected files"
 
 #: ../thunar/thunar-standard-view.c:4114
 msgid "Duplicate the selected file"
@@ -2469,12 +2438,12 @@ msgstr "_Empty File"
 msgid ""
 "Error while copying to \"%s\": %s more space is required to copy to the "
 "destination"
-msgstr ""
+msgstr "Error while copying to \"%s\": %s more space is required to copy to the destination"
 
 #: ../thunar/thunar-transfer-job.c:744
 #, c-format
 msgid "Error while copying to \"%s\": The destination is read-only"
-msgstr ""
+msgstr "Error while copying to \"%s\": The destination is read-only"
 
 #: ../thunar/thunar-transfer-job.c:787
 msgid "Collecting files..."
@@ -2513,30 +2482,30 @@ msgid "Could not move \"%s\" directly. Collecting files for copying..."
 msgstr "Could not move \"%s\" directly. Collecting files for copying..."
 
 #: ../thunar/thunar-transfer-job.c:1084
-#, fuzzy, c-format
+#, c-format
 msgid "%s of %s"
-msgstr "copy of %s"
+msgstr "%s of %s"
 
 #: ../thunar/thunar-transfer-job.c:1104
-#, fuzzy, c-format
+#, c-format
 msgid "%lu hour remaining (%s/sec)"
 msgid_plural "%lu hours remaining (%s/sec)"
-msgstr[0] "%lu hour remaining"
-msgstr[1] "%lu hours remaining"
+msgstr[0] "%lu hour remaining (%s/sec)"
+msgstr[1] "%lu hours remaining (%s/sec)"
 
 #: ../thunar/thunar-transfer-job.c:1112
-#, fuzzy, c-format
+#, c-format
 msgid "%lu minute remaining (%s/sec)"
 msgid_plural "%lu minutes remaining (%s/sec)"
-msgstr[0] "%lu minute remaining"
-msgstr[1] "%lu minutes remaining"
+msgstr[0] "%lu minute remaining (%s/sec)"
+msgstr[1] "%lu minutes remaining (%s/sec)"
 
 #: ../thunar/thunar-transfer-job.c:1119
-#, fuzzy, c-format
+#, c-format
 msgid "%lu second remaining (%s/sec)"
 msgid_plural "%lu seconds remaining (%s/sec)"
-msgstr[0] "%lu second remaining"
-msgstr[1] "%lu seconds remaining"
+msgstr[0] "%lu second remaining (%s/sec)"
+msgstr[1] "%lu seconds remaining (%s/sec)"
 
 #: ../thunar/thunar-trash-action.c:105
 msgid "T_rash"
@@ -2605,19 +2574,16 @@ msgid "%x at %X"
 msgstr "%x at %X"
 
 #: ../thunar/thunar-window.c:337
-#, fuzzy
 msgid "New _Tab"
-msgstr "New Name"
+msgstr "New _Tab"
 
 #: ../thunar/thunar-window.c:337
-#, fuzzy
 msgid "Open a new tab for the displayed location"
-msgstr "Open a new Thunar window for the displayed location"
+msgstr "Open a new tab for the displayed location"
 
 #: ../thunar/thunar-window.c:338
-#, fuzzy
 msgid "New _Window"
-msgstr "Open New _Window"
+msgstr "New _Window"
 
 #: ../thunar/thunar-window.c:338
 msgid "Open a new Thunar window for the displayed location"
@@ -2625,12 +2591,11 @@ msgstr "Open a new Thunar window for the displayed location"
 
 #: ../thunar/thunar-window.c:341
 msgid "Detac_h Tab"
-msgstr ""
+msgstr "Detac_h Tab"
 
 #: ../thunar/thunar-window.c:341
-#, fuzzy
 msgid "Open current folder in a new window"
-msgstr "Open \"%s\" in a new window"
+msgstr "Open current folder in a new window"
 
 #: ../thunar/thunar-window.c:342
 msgid "Close _All Windows"
@@ -2641,19 +2606,16 @@ msgid "Close all Thunar windows"
 msgstr "Close all Thunar windows"
 
 #: ../thunar/thunar-window.c:343
-#, fuzzy
 msgid "C_lose Tab"
-msgstr "_Close"
+msgstr "C_lose Tab"
 
 #: ../thunar/thunar-window.c:343
-#, fuzzy
 msgid "Close this folder"
-msgstr "Close this window"
+msgstr "Close this folder"
 
 #: ../thunar/thunar-window.c:344
-#, fuzzy
 msgid "_Close Window"
-msgstr "Close _All Windows"
+msgstr "_Close Window"
 
 #: ../thunar/thunar-window.c:344
 msgid "Close this window"
@@ -2845,16 +2807,14 @@ msgstr "Change the visibility of this window's statusbar"
 
 #: ../thunar/thunar-window.c:380
 msgid "_Menubar"
-msgstr ""
+msgstr "_Menubar"
 
 #: ../thunar/thunar-window.c:380
-#, fuzzy
 msgid "Change the visibility of this window's menubar"
-msgstr "Change the visibility of this window's statusbar"
+msgstr "Change the visibility of this window's menubar"
 
-#.
 #. * add view options
-#.
+#. 
 #: ../thunar/thunar-window.c:842
 msgid "View as _Icons"
 msgstr "View as _Icons"
@@ -2885,9 +2845,8 @@ msgid "Warning, you are using the root account, you may harm your system."
 msgstr "Warning, you are using the root account, you may harm your system."
 
 #: ../thunar/thunar-window.c:1776
-#, fuzzy
 msgid "Close tab"
-msgstr "_Close"
+msgstr "Close tab"
 
 #. create the network action
 #: ../thunar/thunar-window.c:2022
@@ -2965,8 +2924,8 @@ msgstr ""
 "for the Xfce Desktop Environment."
 
 #. set window title
-#: ../thunar/thunar-window.c:3087 ../Thunar.desktop.in.in.h:3
-#: ../thunar/thunar-settings.desktop.in.h:1
+#: ../thunar/thunar-window.c:3087 ../Thunar.desktop.in.in.h:2
+#: ../thunar/thunar-settings.desktop.in.h:2
 msgid "File Manager"
 msgstr "File Manager"
 
@@ -3028,12 +2987,11 @@ msgstr "The program to execute, possibly with arguments."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:197
 msgid "Working Directory:"
-msgstr ""
+msgstr "Working Directory:"
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:204
-#, fuzzy
 msgid "The working directory for the program."
-msgstr "The working directory must be an absolute path"
+msgstr "The working directory for the program."
 
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:219
 msgid "URL:"
@@ -3205,7 +3163,7 @@ msgstr "Camelcase"
 
 #: ../plugins/thunar-sbr/thunar-sbr-enum-types.c:96
 msgid "Sentence case"
-msgstr ""
+msgstr "Sentence case"
 
 #: ../plugins/thunar-sbr/thunar-sbr-enum-types.c:102
 msgid "Insert"
@@ -3465,13 +3423,13 @@ msgid "Trash is empty"
 msgstr "Wastebasket is empty"
 
 #: ../plugins/thunar-tpa/thunar-tpa.desktop.in.h:1
-msgid "Trash Applet"
-msgstr "Wastebasket Applet"
-
-#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.h:2
 msgid "Display the trash can"
 msgstr "Display the Wastebasket"
 
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.h:2
+msgid "Trash Applet"
+msgstr "Wastebasket Applet"
+
 #: ../plugins/thunar-uca/thunar-uca-chooser.c:116
 msgid "Custom Actions"
 msgstr "Custom Actions"
@@ -3529,9 +3487,8 @@ msgstr ""
 msgid "If you delete a custom action, it is permanently lost."
 msgstr "If you delete a custom action, it is permanently lost."
 
-#.
 #. Basic
-#.
+#. 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:122
 msgid "Basic"
 msgstr "Basic"
@@ -3692,7 +3649,6 @@ msgid "_Other Files"
 msgstr "_Other Files"
 
 #: ../plugins/thunar-uca/thunar-uca-editor.c:445
-#, fuzzy
 msgid ""
 "This page lists the conditions under which the\n"
 "action will appear in the file managers context\n"
@@ -3757,38 +3713,38 @@ msgid "Failed to launch action \"%s\"."
 msgstr "Failed to launch action \"%s\"."
 
 #: ../plugins/thunar-uca/uca.xml.in.h:1
-msgid "Open Terminal Here"
-msgstr "Open Terminal Here"
-
-#: ../plugins/thunar-uca/uca.xml.in.h:2
 msgid "Example for a custom action"
 msgstr "Example for a custom action"
 
+#: ../plugins/thunar-uca/uca.xml.in.h:2
+msgid "Open Terminal Here"
+msgstr "Open Terminal Here"
+
 #: ../plugins/thunar-wallpaper/twp-provider.c:173
 msgid "Set as wallpaper"
 msgstr "Set as wallpaper"
 
 #: ../Thunar.desktop.in.in.h:1
-msgid "Thunar File Manager"
-msgstr "Thunar File Manager"
-
-#: ../Thunar.desktop.in.in.h:2
 msgid "Browse the filesystem with the file manager"
 msgstr "Browse the filesystem with the file manager"
 
+#: ../Thunar.desktop.in.in.h:3
+msgid "Thunar File Manager"
+msgstr "Thunar File Manager"
+
 #: ../Thunar-folder-handler.desktop.in.in.h:1
+msgid "Open Folder"
+msgstr "Open Folder"
+
+#: ../Thunar-folder-handler.desktop.in.in.h:2
 msgid "Open Folder with Thunar"
 msgstr "Open Folder with Thunar"
 
-#: ../Thunar-folder-handler.desktop.in.in.h:2
+#: ../Thunar-folder-handler.desktop.in.in.h:3
 msgid "Open the specified folders in Thunar"
 msgstr "Open the specified folders in Thunar"
 
-#: ../Thunar-folder-handler.desktop.in.in.h:3
-msgid "Open Folder"
-msgstr "Open Folder"
-
-#: ../thunar/thunar-settings.desktop.in.h:2
+#: ../thunar/thunar-settings.desktop.in.h:1
 msgid "Configure the Thunar file manager"
 msgstr "Configure the Thunar file manager"