diff --git a/ChangeLog b/ChangeLog
index dcda3e821cc2ecb51987805c9d29a854ef09e451..bf0fb304775f6a84e1911f4df8f1966a23221757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2006-02-06	Benedikt Meurer <benny@xfce.org>
+
+	* thunar-vfs/thunar-vfs-transfer-job.c(thunar_vfs_transfer_job_execute):
+	  Try to use g_rename() first when moving files, and only fallback to
+	  copy&delete if either the target exists (which requires user inter-
+	  action to resolve the issue) or the rename didn't work, i.e. source
+	  and target are not on the same filesystem. Bug #1229.
+	* thunar-vfs/thunar-vfs-volume.{c,h}: Add thunar_vfs_volume_is_disc()
+	  to allow applications to decide whether to eject or unmount a
+	  volume.
+	* thunar/thunar-shortcuts-view.c
+	  (thunar_shortcuts_view_button_press_event): Use the newly added method
+	  thunar_vfs_volume_is_disc() to determine whether to display Eject or
+	  Unmount.
+	* thunar/thunar-side-pane.{c,h}: Derive ThunarSidePane from
+	  ThunarComponent instead of ThunarNavigator.
+	* thunar/thunar-launcher.c, thunar/thunar-standard-view.c,
+	  thunar/thunar-window.c: Use the class name as name for the action
+	  groups.
+	* thunar/thunar-shortcuts-pane-ui.xml, thunar/thunar-shortcuts-pane.c,
+	  thunar/thunar-window.c, thunar/thunar-window-ui.xml,
+	  thunar/Makefile.am: Add new action to add a folder (or a list of
+	  folders, depending on the selection content) to the shortcuts pane.
+	  Bug #1397.
+	* thunar/thunar-throbber.c, thunar/thunar-throbber-fallback.{h,png},
+	  thunar/Makefile.am: Use the "process-working" icon for the throbber,
+	  as specified by the Icon Naming Specification, with an internal
+	  fallback to a modified version of the Tango "process-working" icon.
+	* configure.in.in, icons/Makefile.am, icons/scalable/,
+	  icons/16x16/Thunar.png, icons/16x16/Thunar.png,
+	  icons/24x24/Thunar.png, icons/48x48/Thunar.png: Revert to the previous
+	  Thunar icon.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+
 2006-02-06	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-properties-dialog.c(thunar_properties_dialog_update):
diff --git a/configure.in.in b/configure.in.in
index a96e363a7b9630cef0b4e64d49b5f8ac55190f6d..56849d184702d3e21325c9582a712632af7e6162 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -378,7 +378,6 @@ icons/Makefile
 icons/16x16/Makefile
 icons/24x24/Makefile
 icons/48x48/Makefile
-icons/scalable/Makefile
 po/Makefile.in
 tdb/Makefile
 tdb/tdbconfig.h
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 7556b9406e20b95f074241e20253df0d97d57614..3426c0f4e84545b8c6580d9ba52825d205089e49 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,9 +1,5 @@
 # $Id$
 
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =								\
-	Thunar.png
-
 stockdir = $(datadir)/icons/hicolor/16x16/stock/generic
 stock_DATA =								\
 	stock_thunar-group.png						\
@@ -11,7 +7,6 @@ stock_DATA =								\
 	stock_thunar-user.png
 
 EXTRA_DIST =								\
-	$(apps_DATA)							\
 	$(stock_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/16x16/Thunar.png b/icons/16x16/Thunar.png
deleted file mode 100644
index c711b5e14206a7145c07f5a7b8ab0d37bbc0094f..0000000000000000000000000000000000000000
Binary files a/icons/16x16/Thunar.png and /dev/null differ
diff --git a/icons/24x24/Thunar.png b/icons/24x24/Thunar.png
index 95d0225d7f73d7f689017619d4c9dfbb3e484454..de5f313124a3bbd3419cc5e56f7638b5e747350d 100644
Binary files a/icons/24x24/Thunar.png and b/icons/24x24/Thunar.png differ
diff --git a/icons/48x48/Thunar.png b/icons/48x48/Thunar.png
index 043a5922246fe00a9e1fe5a65338a594f5e50e25..367a37353649573ac2b31c05ab8ba743e703b5e1 100644
Binary files a/icons/48x48/Thunar.png and b/icons/48x48/Thunar.png differ
diff --git a/icons/Makefile.am b/icons/Makefile.am
index c9a589c38f2fffd09fbfb6fe9a24db3326123fec..18dcae1e27111f1cabc3b53f56a9005fa06fb732 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -3,7 +3,6 @@
 SUBDIRS =								\
 	16x16								\
 	24x24								\
-	48x48								\
-	scalable
+	48x48
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
deleted file mode 100644
index 05004f6fcd25a694966597084f5b44675122e261..0000000000000000000000000000000000000000
--- a/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id$
-
-appsdir = $(datadir)/icons/hicolor/scalable/apps
-apps_DATA =								\
-	Thunar.svg
-
-EXTRA_DIST =								\
-	$(apps_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/scalable/Thunar.svg b/icons/scalable/Thunar.svg
deleted file mode 100644
index 4d73a8611ccb51704557b1476ffd31da62efba38..0000000000000000000000000000000000000000
--- a/icons/scalable/Thunar.svg
+++ /dev/null
@@ -1,1949 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48.000000px"
-   height="48.000000px"
-   id="svg1314"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="/tmp"
-   sodipodi:docname="thunar.svg"
-   inkscape:export-filename="/tmp/thunar_48.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1316">
-    <linearGradient
-       id="linearGradient4370"
-       inkscape:collect="always">
-      <stop
-         id="stop4372"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.0000000" />
-      <stop
-         id="stop4374"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4364"
-       inkscape:collect="always">
-      <stop
-         id="stop4366"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1.0000000" />
-      <stop
-         id="stop4368"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4352"
-       inkscape:collect="always">
-      <stop
-         id="stop4354"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.0000000" />
-      <stop
-         id="stop4356"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4346"
-       inkscape:collect="always">
-      <stop
-         id="stop4348"
-         offset="0"
-         style="stop-color:#555753;stop-opacity:1.0000000" />
-      <stop
-         id="stop4350"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4334"
-       inkscape:collect="always">
-      <stop
-         id="stop4336"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1.0000000" />
-      <stop
-         id="stop4338"
-         offset="1"
-         style="stop-color:#2e3436;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4327">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1.0000000"
-         offset="0"
-         id="stop4329" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="1"
-         id="stop4331" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4321"
-       inkscape:collect="always">
-      <stop
-         id="stop4323"
-         offset="0"
-         style="stop-color:#fbfbfb;stop-opacity:1.0000000" />
-      <stop
-         id="stop4325"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.0000000" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4313">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1.0000000"
-         offset="0"
-         id="stop4315" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000"
-         offset="1"
-         id="stop4317" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4291"
-       inkscape:collect="always">
-      <stop
-         id="stop4293"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1.0000000" />
-      <stop
-         id="stop4295"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4285"
-       inkscape:collect="always">
-      <stop
-         id="stop4287"
-         offset="0"
-         style="stop-color:#888a85;stop-opacity:1.0000000" />
-      <stop
-         id="stop4289"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3309">
-      <stop
-         style="stop-color:#8f5902;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3311" />
-      <stop
-         style="stop-color:#3f2700;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3313" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3301">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3303" />
-      <stop
-         style="stop-color:#1d2122;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3305" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3293">
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3295" />
-      <stop
-         style="stop-color:#1d2122;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3297" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3285">
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3287" />
-      <stop
-         style="stop-color:#1d2122;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3289" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3213">
-      <stop
-         style="stop-color:#1f2020;stop-opacity:1;"
-         offset="0"
-         id="stop3215" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3217" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3205">
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3207" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3209" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3148">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3150" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3152" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3140">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3142" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3144" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3128">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3130" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0.0000000"
-         offset="1"
-         id="stop3132" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3063">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3065" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3067" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3047">
-      <stop
-         style="stop-color:#fbfbfb;stop-opacity:1.0000000"
-         offset="0"
-         id="stop3049" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop3051" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2836">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop2838" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:0;"
-         offset="1"
-         id="stop2840" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2811">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2813" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2815" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2801">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop2803" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2805" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2720">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1.0000000"
-         offset="0"
-         id="stop2722" />
-      <stop
-         style="stop-color:#060606;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2724" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2710">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
-         offset="0"
-         id="stop2712" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2714" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2700">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2702" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2704" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2670"
-       inkscape:collect="always">
-      <stop
-         id="stop2672"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop2674"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:1.0000000" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2660">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1.0000000"
-         offset="0"
-         id="stop2662" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2664" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2645">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop2647" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2649" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2600">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1.0000000"
-         offset="0"
-         id="stop2602" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2604" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2570">
-      <stop
-         style="stop-color:#898b86;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2572" />
-      <stop
-         id="stop2598"
-         offset="0.50000000"
-         style="stop-color:#5e625f;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#1d2122;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2574" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2536">
-      <stop
-         style="stop-color:#f4dbb3;stop-opacity:1;"
-         offset="0"
-         id="stop2538" />
-      <stop
-         style="stop-color:#f4dbb3;stop-opacity:0;"
-         offset="1"
-         id="stop2540" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2516">
-      <stop
-         style="stop-color:#e9b96e;stop-opacity:1.0000000"
-         offset="0"
-         id="stop2518" />
-      <stop
-         style="stop-color:#c17d11;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2520" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2508">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop2510" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2512" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2498">
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000"
-         offset="0"
-         id="stop2500" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2502" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2488">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1.0000000"
-         offset="0"
-         id="stop2490" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000"
-         offset="1"
-         id="stop2492" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3140"
-       id="linearGradient3913"
-       gradientUnits="userSpaceOnUse"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3148"
-       id="linearGradient3915"
-       gradientUnits="userSpaceOnUse"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3063"
-       id="linearGradient3917"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.144551,0.750000)"
-       x1="29.824352"
-       y1="40.151402"
-       x2="22.636547"
-       y2="34.151402" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3047"
-       id="linearGradient3919"
-       gradientUnits="userSpaceOnUse"
-       x1="38.330265"
-       y1="41.020145"
-       x2="39.851955"
-       y2="44.202126" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3128"
-       id="radialGradient3921"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.312500,0.000000,25.43750)"
-       cx="24.000000"
-       cy="37.000000"
-       fx="24.000000"
-       fy="37.000000"
-       r="16.000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2508"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.284770)"
-       x1="12.073041"
-       y1="36.172928"
-       x2="15.983243"
-       y2="29.540051" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2720"
-       id="linearGradient3980"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.699309,-0.607131)"
-       x1="9.1500913"
-       y1="30.290050"
-       x2="23.950090"
-       y2="30.700176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2600"
-       id="linearGradient3983"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075201,0.000000,0.000000,1.075201,-2.642295,5.323943)"
-       x1="24.655788"
-       y1="28.917265"
-       x2="32.797878"
-       y2="36.090683" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2710"
-       id="linearGradient3985"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075201,0.000000,0.000000,1.075201,-2.642295,5.323943)"
-       x1="24.655788"
-       y1="28.917265"
-       x2="32.620346"
-       y2="31.583088" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3301"
-       id="linearGradient3988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
-       x1="23.428712"
-       y1="34.088126"
-       x2="38.556122"
-       y2="34.088126" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2700"
-       id="linearGradient3991"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.284770)"
-       x1="12.686795"
-       y1="28.186703"
-       x2="8.3465776"
-       y2="36.886799" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
-       x1="13.241320"
-       y1="7.6370878"
-       x2="18.305454"
-       y2="12.233282" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
-       x1="17.547098"
-       y1="4.0808506"
-       x2="22.490458"
-       y2="7.7058506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
-       x1="12.904699"
-       y1="8.9323502"
-       x2="20.240931"
-       y2="7.0761948" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3285"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
-       x1="14.434047"
-       y1="9.3562202"
-       x2="38.186804"
-       y2="16.692453" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2488"
-       id="radialGradient4036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.267414,0.315515,-0.251438,1.010024,-4.402386,-1.475035)"
-       cx="16.791676"
-       cy="11.707835"
-       fx="16.791676"
-       fy="11.707835"
-       r="14.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2645"
-       id="linearGradient4038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.582070)"
-       x1="15.563757"
-       y1="7.9082789"
-       x2="25.160458"
-       y2="13.185163" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
-       x1="8.2106591"
-       y1="25.674127"
-       x2="35.615616"
-       y2="28.060614" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2670"
-       id="radialGradient4046"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.370840,0.235504,-0.120034,-0.698704,37.75370,36.40946)"
-       cx="16.236513"
-       cy="19.748014"
-       fx="16.236513"
-       fy="19.748014"
-       r="15.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2660"
-       id="linearGradient4048"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.582070)"
-       x1="12.292107"
-       y1="20.153751"
-       x2="17.634300"
-       y2="30.788061" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2498"
-       id="linearGradient4050"
-       gradientUnits="userSpaceOnUse"
-       x1="30.486519"
-       y1="20.619411"
-       x2="29.230413"
-       y2="13.193694" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3205"
-       id="linearGradient4052"
-       gradientUnits="userSpaceOnUse"
-       x1="27.280222"
-       y1="21.713293"
-       x2="26.293383"
-       y2="13.864183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2836"
-       id="linearGradient4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
-       x1="26.779949"
-       y1="18.479218"
-       x2="29.489973"
-       y2="22.055546" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-0.309830)"
-       x1="33.104156"
-       y1="10.245938"
-       x2="38.245445"
-       y2="16.779818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4058"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
-       x1="31.672344"
-       y1="10.160965"
-       x2="36.539341"
-       y2="19.535965" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-0.309830)"
-       x1="31.184426"
-       y1="12.113161"
-       x2="40.886247"
-       y2="12.113161" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2801"
-       id="linearGradient4062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
-       x1="18.743164"
-       y1="8.7794323"
-       x2="22.803753"
-       y2="11.765332" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3213"
-       id="linearGradient4064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
-       x1="20.493164"
-       y1="15.739577"
-       x2="14.725269"
-       y2="11.408548" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2811"
-       id="linearGradient4066"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
-       x1="13.788582"
-       y1="10.905776"
-       x2="21.589458"
-       y2="23.456921" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2811"
-       id="linearGradient4075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="13.788582"
-       y1="10.905776"
-       x2="21.589458"
-       y2="23.456921" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2801"
-       id="linearGradient4078"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="18.743164"
-       y1="8.7794323"
-       x2="22.803753"
-       y2="11.765332" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3213"
-       id="linearGradient4080"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="20.493164"
-       y1="15.739577"
-       x2="14.725269"
-       y2="11.408548" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4083"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
-       x1="31.184426"
-       y1="12.113161"
-       x2="40.886247"
-       y2="12.113161" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4086"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
-       x1="33.104156"
-       y1="10.245938"
-       x2="38.245445"
-       y2="16.779818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4088"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="31.672344"
-       y1="10.160965"
-       x2="36.539341"
-       y2="19.535965" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2836"
-       id="linearGradient4091"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="26.779949"
-       y1="18.479218"
-       x2="29.489973"
-       y2="22.055546" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2670"
-       id="radialGradient4095"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.439197,0.247247,-0.126019,-0.733545,37.73115,39.88453)"
-       cx="16.236513"
-       cy="19.748014"
-       fx="16.236513"
-       fy="19.748014"
-       r="15.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2660"
-       id="linearGradient4097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
-       x1="12.292107"
-       y1="20.153751"
-       x2="17.634300"
-       y2="30.788061" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="8.2106591"
-       y1="25.674127"
-       x2="35.615616"
-       y2="28.060614" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2488"
-       id="radialGradient4105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.330614,0.331248,-0.263976,1.060389,-6.527046,0.110923)"
-       cx="16.791676"
-       cy="11.707835"
-       fx="16.791676"
-       fy="11.707835"
-       r="14.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2645"
-       id="linearGradient4107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
-       x1="15.563757"
-       y1="7.9082789"
-       x2="25.160458"
-       y2="13.185163" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3285"
-       id="linearGradient4110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="14.434047"
-       y1="9.3562202"
-       x2="38.186804"
-       y2="16.692453" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="12.904699"
-       y1="8.9323502"
-       x2="20.240931"
-       y2="7.0761948" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4116"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="13.241320"
-       y1="7.6370878"
-       x2="18.305454"
-       y2="12.233282" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="17.547098"
-       y1="4.0808506"
-       x2="22.490458"
-       y2="7.7058506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="13.241320"
-       y1="7.6370878"
-       x2="18.305454"
-       y2="12.233282" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4140"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="17.547098"
-       y1="4.0808506"
-       x2="22.490458"
-       y2="7.7058506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="12.904699"
-       y1="8.9323502"
-       x2="20.240931"
-       y2="7.0761948" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3285"
-       id="linearGradient4144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="14.434047"
-       y1="9.3562202"
-       x2="38.186804"
-       y2="16.692453" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2488"
-       id="radialGradient4146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.330614,0.331248,-0.263976,1.060389,-6.527046,0.110923)"
-       cx="16.791676"
-       cy="11.707835"
-       fx="16.791676"
-       fy="11.707835"
-       r="14.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2645"
-       id="linearGradient4148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
-       x1="15.563757"
-       y1="7.9082789"
-       x2="25.160458"
-       y2="13.185163" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4152"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="8.2106591"
-       y1="25.674127"
-       x2="35.615616"
-       y2="28.060614" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2670"
-       id="radialGradient4156"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.439197,0.247247,-0.126019,-0.733545,37.73115,39.88453)"
-       cx="16.236513"
-       cy="19.748014"
-       fx="16.236513"
-       fy="19.748014"
-       r="15.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2660"
-       id="linearGradient4158"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
-       x1="12.292107"
-       y1="20.153751"
-       x2="17.634300"
-       y2="30.788061" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4346"
-       id="linearGradient4160"
-       gradientUnits="userSpaceOnUse"
-       x1="30.486519"
-       y1="20.619411"
-       x2="29.230413"
-       y2="13.193694" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3205"
-       id="linearGradient4162"
-       gradientUnits="userSpaceOnUse"
-       x1="27.280222"
-       y1="21.713293"
-       x2="26.293383"
-       y2="13.864183" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2836"
-       id="linearGradient4164"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="26.779949"
-       y1="18.479218"
-       x2="29.489973"
-       y2="22.055546" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4166"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
-       x1="33.104156"
-       y1="10.245938"
-       x2="38.245445"
-       y2="16.779818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4168"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="31.672344"
-       y1="10.160965"
-       x2="36.539341"
-       y2="19.535965" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4170"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
-       x1="31.184426"
-       y1="12.113161"
-       x2="40.886247"
-       y2="12.113161" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2801"
-       id="linearGradient4172"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="18.743164"
-       y1="8.7794323"
-       x2="22.803753"
-       y2="11.765332" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3213"
-       id="linearGradient4174"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
-       x1="20.493164"
-       y1="15.739577"
-       x2="14.725269"
-       y2="11.408548" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2811"
-       id="linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
-       x1="13.788582"
-       y1="10.905776"
-       x2="21.589458"
-       y2="23.456921" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4178"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2570"
-       id="radialGradient4180"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
-       cx="15.621862"
-       cy="20.759830"
-       fx="15.621862"
-       fy="20.759830"
-       r="0.84002739" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4370"
-       id="linearGradient4191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
-       x1="13.788582"
-       y1="10.905776"
-       x2="21.589458"
-       y2="23.456921" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2801"
-       id="linearGradient4194"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
-       x1="18.743164"
-       y1="8.7794323"
-       x2="22.803753"
-       y2="11.765332" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3213"
-       id="linearGradient4196"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
-       x1="20.493164"
-       y1="15.739577"
-       x2="14.725269"
-       y2="11.408548" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,0.109893)"
-       x1="33.223328"
-       y1="15.477352"
-       x2="45.881561"
-       y2="4.7731071" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4202"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,0.109893)"
-       x1="33.104156"
-       y1="10.245938"
-       x2="38.245445"
-       y2="16.779818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4204"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
-       x1="31.672344"
-       y1="10.160965"
-       x2="36.539341"
-       y2="19.535965" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2836"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
-       x1="26.779949"
-       y1="18.479218"
-       x2="29.489973"
-       y2="22.055546" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4327"
-       id="radialGradient4211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.413431,0.242821,-0.123763,-0.720412,38.63788,37.97003)"
-       cx="16.236513"
-       cy="19.748014"
-       fx="16.236513"
-       fy="19.748014"
-       r="15.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4352"
-       id="linearGradient4213"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,1.029504)"
-       x1="12.292107"
-       y1="20.153751"
-       x2="17.634300"
-       y2="30.788061" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4217"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.219454,0.000000,0.000000,1.219454,-7.770440,-0.189159)"
-       x1="8.2106591"
-       y1="25.674127"
-       x2="35.615616"
-       y2="28.060614" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4334"
-       id="radialGradient4221"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.306792,0.325318,-0.25925,1.041405,-4.827965,-1.091514)"
-       cx="16.123058"
-       cy="11.746952"
-       fx="16.123058"
-       fy="11.746952"
-       r="14.400000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4364"
-       id="linearGradient4223"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,1.029504)"
-       x1="15.563757"
-       y1="7.9082789"
-       x2="25.160458"
-       y2="13.185163" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3285"
-       id="linearGradient4226"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
-       x1="14.434047"
-       y1="9.3562202"
-       x2="38.186804"
-       y2="16.692453" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2536"
-       id="linearGradient4229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
-       x1="12.904699"
-       y1="8.9323502"
-       x2="20.240931"
-       y2="7.0761948" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2516"
-       id="linearGradient4232"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
-       x1="13.241320"
-       y1="7.6370878"
-       x2="18.305454"
-       y2="12.233282" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309"
-       id="linearGradient4234"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
-       x1="17.547098"
-       y1="4.0808506"
-       x2="22.490458"
-       y2="7.7058506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2508"
-       id="linearGradient4238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,1.029504)"
-       x1="12.292107"
-       y1="20.153751"
-       x2="17.634300"
-       y2="30.788061" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3047"
-       id="linearGradient4242"
-       gradientUnits="userSpaceOnUse"
-       x1="38.330265"
-       y1="41.020145"
-       x2="39.851955"
-       y2="44.202126"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3063"
-       id="linearGradient4246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-0.131319,-1.573498)"
-       x1="29.824352"
-       y1="40.151402"
-       x2="22.636547"
-       y2="34.151402" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3140"
-       id="linearGradient4249"
-       gradientUnits="userSpaceOnUse"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3148"
-       id="linearGradient4251"
-       gradientUnits="userSpaceOnUse"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3140"
-       id="linearGradient4260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3148"
-       id="linearGradient4262"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3063"
-       id="linearGradient4264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-0.131319,-1.573498)"
-       x1="29.824352"
-       y1="40.151402"
-       x2="22.636547"
-       y2="34.151402" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3047"
-       id="linearGradient4266"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)"
-       x1="38.330265"
-       y1="41.020145"
-       x2="39.851955"
-       y2="44.202126" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3128"
-       id="radialGradient4268"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.312500,0.000000,25.43750)"
-       cx="24.000000"
-       cy="37.000000"
-       fx="24.000000"
-       fy="37.000000"
-       r="16.000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4321"
-       id="linearGradient4272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-0.869861)"
-       x1="38.330265"
-       y1="41.020145"
-       x2="39.851955"
-       y2="44.202126" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3063"
-       id="linearGradient4276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-0.131319,-7.349800e-2)"
-       x1="29.824352"
-       y1="40.151402"
-       x2="22.636547"
-       y2="34.151402" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4291"
-       id="linearGradient4279"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-0.869861)"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4285"
-       id="linearGradient4281"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-0.869861)"
-       x1="10.243904"
-       y1="31.474367"
-       x2="36.256096"
-       y2="45.828430" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3128"
-       id="radialGradient4283"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.312500,0.000000,25.43750)"
-       cx="24.000000"
-       cy="37.000000"
-       fx="24.000000"
-       fy="37.000000"
-       r="16.000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4313"
-       id="linearGradient4319"
-       x1="34.763798"
-       y1="41.308498"
-       x2="37.783447"
-       y2="46.064751"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.140625"
-     inkscape:cx="25.25"
-     inkscape:cy="23.5"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridspacingx="2.0000000px"
-     gridspacingy="2.0000000px"
-     gridtolerance="1.0000000px"
-     inkscape:grid-points="true"
-     inkscape:window-width="1120"
-     inkscape:window-height="890"
-     inkscape:window-x="1363"
-     inkscape:window-y="69"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="true"
-     guidetolerance="1.0000000px">
-    <sodipodi:guide
-       orientation="vertical"
-       position="39.244426"
-       id="guide4182" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="20.859650"
-       id="guide4184" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="3.7123106"
-       id="guide4186" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1319">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Palette"
-     inkscape:groupmode="layer"
-     sodipodi:insensitive="true"
-     style="display:none">
-    <g
-       id="g1444"
-       transform="matrix(0.145447,0,0,0.145447,-36.80275,-2.762314)">
-      <path
-         id="rect139_1_"
-         d="M 164.5164,135.3145 L 176.6932,135.3145 C 179.6698,135.3145 182.0828,137.7295 182.0828,140.7071 L 182.0828,152.8829 C 182.0828,155.8604 179.6697,158.2735 176.6932,158.2735 L 164.5164,158.2735 C 161.5398,158.2735 159.1248,155.8604 159.1248,152.8829 L 159.1248,140.7071 C 159.1248,137.7295 161.5398,135.3145 164.5164,135.3145 z "
-         style="fill:#8ae234;fill-opacity:1" />
-      <path
-         id="rect145_1_"
-         d="M 194.1248,135.3145 L 206.2996,135.3145 C 209.2781,135.3145 211.6912,137.7295 211.6912,140.7071 L 211.6912,152.8829 C 211.6912,155.8604 209.2781,158.2735 206.2996,158.2735 L 194.1248,158.2735 C 191.1463,158.2735 188.7322,155.8604 188.7322,152.8829 L 188.7322,140.7071 C 188.7322,137.7295 191.1462,135.3145 194.1248,135.3145 z "
-         style="fill:#73d216;fill-opacity:1" />
-      <path
-         id="rect157_1_"
-         d="M 223.7312,135.3145 L 235.907,135.3145 C 238.8845,135.3145 241.2976,137.7295 241.2976,140.7071 L 241.2976,152.8829 C 241.2976,155.8604 238.8845,158.2735 235.907,158.2735 L 223.7312,158.2735 C 220.7537,158.2735 218.3396,155.8604 218.3396,152.8829 L 218.3396,140.7071 C 218.3396,137.7295 220.7537,135.3145 223.7312,135.3145 z "
-         style="fill:#4e9a06;fill-opacity:1" />
-      <path
-         id="rect140_1_"
-         d="M 164.5164,76.099602 L 176.6932,76.099602 C 179.6698,76.099602 182.0828,78.514602 182.0828,81.492202 L 182.0828,93.668002 C 182.0828,96.645502 179.6697,99.058602 176.6932,99.058602 L 164.5164,99.058602 C 161.5398,99.058602 159.1248,96.645502 159.1248,93.668002 L 159.1248,81.492202 C 159.1248,78.514702 161.5398,76.099602 164.5164,76.099602 z "
-         style="fill:#fcaf3e" />
-      <path
-         id="rect146_1_"
-         d="M 194.1248,76.099602 L 206.2996,76.099602 C 209.2781,76.099602 211.6912,78.514602 211.6912,81.492202 L 211.6912,93.668002 C 211.6912,96.645502 209.2781,99.058602 206.2996,99.058602 L 194.1248,99.058602 C 191.1463,99.058602 188.7322,96.645502 188.7322,93.668002 L 188.7322,81.492202 C 188.7322,78.514702 191.1462,76.099602 194.1248,76.099602 z "
-         style="fill:#f57900" />
-      <path
-         id="rect158_1_"
-         d="M 223.7312,76.099602 L 235.907,76.099602 C 238.8845,76.099602 241.2976,78.514602 241.2976,81.492202 L 241.2976,93.668002 C 241.2976,96.645502 238.8845,99.058602 235.907,99.058602 L 223.7312,99.058602 C 220.7537,99.058602 218.3396,96.645502 218.3396,93.668002 L 218.3396,81.492202 C 218.3396,78.514702 220.7537,76.099602 223.7312,76.099602 z "
-         style="fill:#ce5c00" />
-      <path
-         id="rect141_3_"
-         d="M 164.5164,164.9238 L 176.6932,164.9238 C 179.6698,164.9238 182.0828,167.3369 182.0828,170.3144 L 182.0828,182.4892 C 182.0828,185.4677 179.6697,187.8818 176.6932,187.8818 L 164.5164,187.8818 C 161.5398,187.8818 159.1248,185.4677 159.1248,182.4892 L 159.1248,170.3144 C 159.1248,167.3369 161.5398,164.9238 164.5164,164.9238 z "
-         style="fill:#729fcf" />
-      <path
-         id="rect147_3_"
-         d="M 194.1248,164.9238 L 206.2996,164.9238 C 209.2781,164.9238 211.6912,167.3369 211.6912,170.3144 L 211.6912,182.4892 C 211.6912,185.4677 209.2781,187.8818 206.2996,187.8818 L 194.1248,187.8818 C 191.1463,187.8818 188.7322,185.4677 188.7322,182.4892 L 188.7322,170.3144 C 188.7322,167.3369 191.1462,164.9238 194.1248,164.9238 z "
-         style="fill:#3465a4" />
-      <path
-         id="rect159_3_"
-         d="M 223.7312,164.9238 L 235.907,164.9238 C 238.8845,164.9238 241.2976,167.3369 241.2976,170.3144 L 241.2976,182.4892 C 241.2976,185.4677 238.8845,187.8818 235.907,187.8818 L 223.7312,187.8818 C 220.7537,187.8818 218.3396,185.4677 218.3396,182.4892 L 218.3396,170.3144 C 218.3396,167.3369 220.7537,164.9238 223.7312,164.9238 z "
-         style="fill:#204a87" />
-      <path
-         id="rect168_1_"
-         d="M 164.5164,268.9414 L 176.6932,268.9414 C 179.6698,268.9414 182.0828,271.3545 182.0828,274.333 L 182.0828,286.5098 C 182.0828,289.4864 179.6697,291.9014 176.6932,291.9014 L 164.5164,291.9014 C 161.5398,291.9014 159.1248,289.4864 159.1248,286.5098 L 159.1248,274.333 C 159.1248,271.3545 161.5398,268.9414 164.5164,268.9414 z "
-         style="fill:#eeeeec" />
-      <path
-         id="rect169_1_"
-         d="M 194.1248,268.9414 L 206.2996,268.9414 C 209.2781,268.9414 211.6912,271.3545 211.6912,274.333 L 211.6912,286.5098 C 211.6912,289.4864 209.2781,291.9014 206.2996,291.9014 L 194.1248,291.9014 C 191.1463,291.9014 188.7322,289.4864 188.7322,286.5098 L 188.7322,274.333 C 188.7322,271.3545 191.1462,268.9414 194.1248,268.9414 z "
-         style="fill:#d3d7cf" />
-      <path
-         id="rect181_1_"
-         d="M 223.7312,268.9414 L 235.907,268.9414 C 238.8845,268.9414 241.2976,271.3545 241.2976,274.333 L 241.2976,286.5098 C 241.2976,289.4864 238.8845,291.9014 235.907,291.9014 L 223.7312,291.9014 C 220.7537,291.9014 218.3396,289.4864 218.3396,286.5098 L 218.3396,274.333 C 218.3396,271.3545 220.7537,268.9414 223.7312,268.9414 z "
-         style="fill:#babdb6" />
-      <path
-         id="rect171_1_"
-         d="M 194.1248,298.5488 L 206.2996,298.5488 C 209.2781,298.5488 211.6912,300.9648 211.6912,303.9404 L 211.6912,316.1162 C 211.6912,319.0947 209.2781,321.5068 206.2996,321.5068 L 194.1248,321.5068 C 191.1463,321.5068 188.7322,319.0947 188.7322,316.1162 L 188.7322,303.9404 C 188.7322,300.9648 191.1462,298.5488 194.1248,298.5488 z "
-         style="fill:#555753" />
-      <path
-         id="rect183_1_"
-         d="M 223.7312,298.5488 L 235.907,298.5488 C 238.8845,298.5488 241.2976,300.9648 241.2976,303.9404 L 241.2976,316.1162 C 241.2976,319.0947 238.8845,321.5068 235.907,321.5068 L 223.7312,321.5068 C 220.7537,321.5068 218.3396,319.0947 218.3396,316.1162 L 218.3396,303.9404 C 218.3396,300.9648 220.7537,298.5488 223.7312,298.5488 z "
-         style="fill:#2e3436" />
-      <path
-         id="rect193_1_"
-         d="M 164.5164,298.5488 L 176.6932,298.5488 C 179.6698,298.5488 182.0828,300.9648 182.0828,303.9404 L 182.0828,316.1162 C 182.0828,319.0947 179.6697,321.5068 176.6932,321.5068 L 164.5164,321.5068 C 161.5398,321.5068 159.1248,319.0947 159.1248,316.1162 L 159.1248,303.9404 C 159.1248,300.9648 161.5398,298.5488 164.5164,298.5488 z "
-         style="fill:#888a85" />
-      <path
-         id="rect301_1_"
-         d="M 164.5164,46.493202 L 176.6932,46.493202 C 179.6698,46.493202 182.0828,48.906302 182.0828,51.883802 L 182.0828,64.059602 C 182.0828,67.037102 179.6697,69.451202 176.6932,69.451202 L 164.5164,69.451202 C 161.5398,69.451202 159.1248,67.037102 159.1248,64.059602 L 159.1248,51.883802 C 159.1248,48.906302 161.5398,46.493202 164.5164,46.493202 z "
-         style="fill:#fce94f" />
-      <path
-         id="rect302_1_"
-         d="M 194.1248,46.493202 L 206.2996,46.493202 C 209.2781,46.493202 211.6912,48.906302 211.6912,51.883802 L 211.6912,64.059602 C 211.6912,67.037102 209.2781,69.451202 206.2996,69.451202 L 194.1248,69.451202 C 191.1463,69.451202 188.7322,67.037102 188.7322,64.059602 L 188.7322,51.883802 C 188.7322,48.906302 191.1462,46.493202 194.1248,46.493202 z "
-         style="fill:#edd400" />
-      <path
-         id="rect303_1_"
-         d="M 223.7312,46.493202 L 235.907,46.493202 C 238.8845,46.493202 241.2976,48.906302 241.2976,51.883802 L 241.2976,64.059602 C 241.2976,67.037102 238.8845,69.451202 235.907,69.451202 L 223.7312,69.451202 C 220.7537,69.451202 218.3396,67.037102 218.3396,64.059602 L 218.3396,51.883802 C 218.3396,48.906302 220.7537,46.493202 223.7312,46.493202 z "
-         style="fill:#c4a000" />
-      <path
-         id="rect305_1_"
-         d="M 164.5164,105.708 L 176.6932,105.708 C 179.6698,105.708 182.0828,108.1211 182.0828,111.0996 L 182.0828,123.2744 C 182.0828,126.2519 179.6697,128.666 176.6932,128.666 L 164.5164,128.666 C 161.5398,128.666 159.1248,126.2519 159.1248,123.2744 L 159.1248,111.0996 C 159.1248,108.1211 161.5398,105.708 164.5164,105.708 z "
-         style="fill:#e9b96e" />
-      <path
-         id="rect306_1_"
-         d="M 194.1248,105.708 L 206.2996,105.708 C 209.2781,105.708 211.6912,108.1211 211.6912,111.0996 L 211.6912,123.2744 C 211.6912,126.2519 209.2781,128.666 206.2996,128.666 L 194.1248,128.666 C 191.1463,128.666 188.7322,126.2519 188.7322,123.2744 L 188.7322,111.0996 C 188.7322,108.1211 191.1462,105.708 194.1248,105.708 z "
-         style="fill:#c17d11" />
-      <path
-         id="rect307_1_"
-         d="M 223.7312,105.708 L 235.907,105.708 C 238.8845,105.708 241.2976,108.1211 241.2976,111.0996 L 241.2976,123.2744 C 241.2976,126.2519 238.8845,128.666 235.907,128.666 L 223.7312,128.666 C 220.7537,128.666 218.3396,126.2519 218.3396,123.2744 L 218.3396,111.0996 C 218.3396,108.1211 220.7537,105.708 223.7312,105.708 z "
-         style="fill:#8f5902" />
-      <path
-         id="rect141_2_"
-         d="M 164.5164,194.9238 L 176.6932,194.9238 C 179.6698,194.9238 182.0828,197.3369 182.0828,200.3144 L 182.0828,212.4892 C 182.0828,215.4677 179.6697,217.8818 176.6932,217.8818 L 164.5164,217.8818 C 161.5398,217.8818 159.1248,215.4677 159.1248,212.4892 L 159.1248,200.3144 C 159.1248,197.3369 161.5398,194.9238 164.5164,194.9238 z "
-         style="fill:#ad7fa8" />
-      <path
-         id="rect147_2_"
-         d="M 194.1248,194.9238 L 206.2996,194.9238 C 209.2781,194.9238 211.6912,197.3369 211.6912,200.3144 L 211.6912,212.4892 C 211.6912,215.4677 209.2781,217.8818 206.2996,217.8818 L 194.1248,217.8818 C 191.1463,217.8818 188.7322,215.4677 188.7322,212.4892 L 188.7322,200.3144 C 188.7322,197.3369 191.1462,194.9238 194.1248,194.9238 z "
-         style="fill:#75507b" />
-      <path
-         id="rect159_2_"
-         d="M 223.7312,194.9238 L 235.907,194.9238 C 238.8845,194.9238 241.2976,197.3369 241.2976,200.3144 L 241.2976,212.4892 C 241.2976,215.4677 238.8845,217.8818 235.907,217.8818 L 223.7312,217.8818 C 220.7537,217.8818 218.3396,215.4677 218.3396,212.4892 L 218.3396,200.3144 C 218.3396,197.3369 220.7537,194.9238 223.7312,194.9238 z "
-         style="fill:#5c3566" />
-      <text
-         id="text1529"
-         x="142.30692"
-         y="178.88181"
-         style="fill:#a7a7a7;fill-opacity:1">
-        <tspan
-           x="142.30692"
-           y="178.88181"
-           font-size="8"
-           id="tspan1531"
-           style="font-size:8px" />
-      </text>
-      <text
-         id="text1533"
-         x="106.27762"
-         y="60.861805"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="106.27762"
-           y="60.861805"
-           font-size="11"
-           id="tspan1535"
-           style="font-size:11px;font-family:Trebuchet MS">Butter</tspan>
-      </text>
-      <text
-         id="text1537"
-         x="106.36356"
-         y="90.468803"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="106.36356"
-           y="90.468803"
-           font-size="11"
-           id="tspan1539"
-           style="font-size:11px;font-family:Trebuchet MS">Orange</tspan>
-      </text>
-      <text
-         id="text1541"
-         x="91.517853"
-         y="120.07671"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="91.517853"
-           y="120.07671"
-           font-size="11"
-           id="tspan1543"
-           style="font-size:11px;font-family:Trebuchet MS">Chocolate</tspan>
-      </text>
-      <text
-         id="text1545"
-         x="85.85672"
-         y="149.68359"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="85.85672"
-           y="149.68359"
-           font-size="11"
-           id="tspan1547"
-           style="font-size:11px;font-family:Trebuchet MS">Chameleon</tspan>
-      </text>
-      <text
-         id="text1549"
-         x="99.187775"
-         y="179.29199"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="99.187775"
-           y="179.29199"
-           font-size="11"
-           id="tspan1551"
-           style="font-size:11px;font-family:Trebuchet MS">Sky Blue</tspan>
-      </text>
-      <text
-         id="text1553"
-         x="142.30692"
-         y="208.88181"
-         style="fill:#a7a7a7;fill-opacity:1">
-        <tspan
-           x="142.30692"
-           y="208.88181"
-           font-size="8"
-           id="tspan1555"
-           style="font-size:8px" />
-      </text>
-      <text
-         id="text1557"
-         x="117.35818"
-         y="209.29199"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="117.35818"
-           y="209.29199"
-           font-size="11"
-           id="tspan1559"
-           style="font-size:11px;font-family:Trebuchet MS">Plum</tspan>
-      </text>
-      <text
-         id="text1561"
-         x="84.438751"
-         y="238.89841"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="84.438751"
-           y="238.89841"
-           font-size="11"
-           id="tspan1563"
-           style="font-size:11px;font-family:Trebuchet MS">Scarlet Red</tspan>
-      </text>
-      <text
-         id="text1565"
-         x="87.838654"
-         y="283.3096"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
-         sodipodi:linespacing="100%">
-        <tspan
-           x="87.838654"
-           y="283.3096"
-           font-size="11"
-           id="tspan1567"
-           style="font-size:11px;font-family:Trebuchet MS">Aluminium</tspan>
-      </text>
-      <path
-         id="rect170_1_"
-         d="M 164.5164,224.5293 L 176.6932,224.5293 C 179.6698,224.5293 182.0828,226.9443 182.0828,229.9219 L 182.0828,242.0977 C 182.0828,245.0743 179.6697,247.4903 176.6932,247.4903 L 164.5164,247.4903 C 161.5398,247.4903 159.1248,245.0743 159.1248,242.0977 L 159.1248,229.9219 C 159.1248,226.9443 161.5398,224.5293 164.5164,224.5293 z "
-         style="fill:#ef2929" />
-      <path
-         id="rect182_1_"
-         d="M 194.1248,224.5293 L 206.2996,224.5293 C 209.2781,224.5293 211.6912,226.9443 211.6912,229.9219 L 211.6912,242.0977 C 211.6912,245.0743 209.2781,247.4903 206.2996,247.4903 L 194.1248,247.4903 C 191.1463,247.4903 188.7322,245.0743 188.7322,242.0977 L 188.7322,229.9219 C 188.7322,226.9443 191.1462,224.5293 194.1248,224.5293 z "
-         style="fill:#cc0000" />
-      <path
-         id="rect344_1_"
-         d="M 223.3259,224.5293 L 235.5007,224.5293 C 238.4782,224.5293 240.8943,226.9443 240.8943,229.9219 L 240.8943,242.0977 C 240.8943,245.0743 238.4783,247.4903 235.5007,247.4903 L 223.3259,247.4903 C 220.3484,247.4903 217.9343,245.0743 217.9343,242.0977 L 217.9343,229.9219 C 217.9343,226.9443 220.3484,224.5293 223.3259,224.5293 z "
-         style="fill:#a40000" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Helm"
-     style="display:inline">
-    <g
-       id="g4004"
-       style="display:none">
-      <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3991);stroke-width:2.3999958;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 5.6576651,30.657018 C 5.6576651,30.657018 22.306476,25.900215 22.306476,25.900215 C 22.306476,25.900215 16.955073,32.264681 16.955073,39.399886 C 16.955073,39.399886 14.151346,39.587854 10.414468,41.778287 C 10.414468,41.778287 10.414468,30.657018 5.6576651,30.657018 z "
-         id="path2718"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path2708"
-         d="M 21.872375,35.747494 C 21.872375,35.747494 36.925182,31.709416 36.925182,31.709416 C 36.925182,31.709416 32.62438,37.16188 32.62438,43.613082 C 32.62438,43.613082 30.473979,45.763483 26.173177,45.763483 C 26.173177,45.763483 26.173177,35.747494 21.872375,35.747494 z "
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3988);stroke-width:2.3999958;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         style="opacity:1;fill:url(#linearGradient3983);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3985);stroke-width:0.79999912;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 21.872375,35.747494 C 21.872375,35.747494 36.925182,31.709416 36.925182,31.709416 C 36.925182,31.709416 32.62438,36.881889 32.62438,43.333091 C 32.62438,43.333091 30.473979,45.483491 26.173177,45.483491 C 26.173177,45.483491 26.173177,35.747494 21.872375,35.747494 z "
-         id="path2294"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path2299"
-         d="M 5.6576651,30.657018 C 5.6576651,30.657018 22.306476,25.900215 22.306476,25.900215 C 22.306476,25.900215 16.955073,32.264681 16.955073,39.399886 C 16.955073,39.399886 13.601317,39.803589 10.414468,41.778287 C 10.414468,41.778287 10.414468,30.657018 5.6576651,30.657018 z "
-         style="opacity:1;fill:url(#linearGradient3978);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3980);stroke-width:0.7999987;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <g
-       id="g4389"
-       transform="translate(-0.448808,4.129032)">
-      <path
-         sodipodi:nodetypes="csscscc"
-         id="path2624"
-         d="M 10.412862,19.248805 C 10.412862,19.248805 7.1512025,14.098814 8.3528671,10.665486 C 9.5545314,7.2321586 13.846189,7.0604922 16.24952,5.0004956 C 18.652848,2.9404993 19.167849,1.9105008 19.167849,1.9105008 C 19.167849,1.9105008 18.13785,8.4338233 16.421185,9.8071544 C 14.704522,11.180485 16.421185,14.442147 16.421185,14.442147 L 10.412862,19.248805 z "
-         style="opacity:1;fill:url(#linearGradient4232);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4234);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="czscscc"
-         id="path2852"
-         d="M 9.3513545,12.276213 C 9.3513545,11.842705 9.4177997,10.553989 10.435127,9.4584059 C 11.452454,8.3628226 12.927802,8.3746338 14.336708,7.6159931 C 15.745613,6.8573524 17.046139,5.5568258 17.046139,5.5568258 C 17.046139,5.5568258 15.745613,8.0495023 14.011577,9.0248974 C 12.27754,10.000293 11.410521,11.842705 11.410521,11.842705 L 9.3513545,12.276213 z "
-         style="opacity:1;fill:url(#linearGradient4229);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cczc"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4226);stroke-width:2.39999676;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 6.2878854,27.046841 C 15.002654,32.8994 28.020809,32.915906 36.711694,27.008522 C 39.656036,17.932466 31.788892,8.8953618 20.526971,8.8953618 C 9.1465263,8.8953618 3.8052026,19.885875 6.2878854,27.046841 z "
-         id="path2641" />
-      <path
-         sodipodi:nodetypes="cczc"
-         id="path2264"
-         d="M 6.2878854,27.046841 C 15.002654,32.8994 28.020809,32.915906 36.711694,27.008522 C 39.656036,17.932466 31.107555,8.8953618 20.526971,8.8953618 C 9.2353337,8.8953618 3.8052026,19.885875 6.2878854,27.046841 z "
-         style="opacity:1;fill:url(#radialGradient4221);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4223);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4238);stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 4.9315713,24.988506 C 4.9315713,24.988506 6.7707928,29.893099 21.484574,29.893099 C 36.198355,29.893099 38.037578,24.988506 38.037578,24.988506 C 38.037578,24.988506 39.244426,25.882718 39.244426,27.120155 C 39.244426,27.120155 39.263726,32.345397 39.263726,32.345397 C 39.263726,32.345397 36.198355,37.24999 21.484574,37.24999 C 6.7707928,37.24999 3.7054225,32.345397 3.7054225,32.345397 C 3.7054225,32.345397 3.7123106,27.14035 3.7123106,27.14035 C 3.7123106,25.593554 4.9315713,24.988506 4.9315713,24.988506 z "
-         id="path4236"
-         sodipodi:nodetypes="czcscscsc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#radialGradient4150);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path3337"
-         sodipodi:cx="15.820516"
-         sodipodi:cy="20.979118"
-         sodipodi:rx="0.84002739"
-         sodipodi:ry="0.77002507"
-         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
-         transform="matrix(1.495931,0,0,1.495931,-14.89071,-7.207778)" />
-      <path
-         transform="matrix(1.495931,0,0,1.495931,-14.12856,-12.69531)"
-         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
-         sodipodi:ry="0.77002507"
-         sodipodi:rx="0.84002739"
-         sodipodi:cy="20.979118"
-         sodipodi:cx="15.820516"
-         id="path3339"
-         style="opacity:1;fill:url(#radialGradient4154);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="czcscscsc"
-         id="path2271"
-         d="M 4.9315713,24.988506 C 4.9315713,24.988506 6.7707928,29.893099 21.484574,29.893099 C 36.198355,29.893099 38.037578,24.988506 38.037578,24.988506 C 38.037578,24.988506 39.244426,25.882718 39.244426,27.120155 C 39.244426,27.120155 39.263726,32.345397 39.263726,32.345397 C 39.263726,32.345397 36.198355,37.24999 21.484574,37.24999 C 6.7707928,37.24999 3.7054225,32.345397 3.7054225,32.345397 C 3.7054225,32.345397 3.7123106,27.14035 3.7123106,27.14035 C 3.7123106,25.593554 4.9315713,24.988506 4.9315713,24.988506 z "
-         style="opacity:1;fill:url(#radialGradient4211);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4213);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         transform="matrix(1.093101,-0.292896,0.292896,1.093101,-6.218654,10.58132)"
-         d="M 34 17 A 4 5 0 1 1  26,17 A 4 5 0 1 1  34 17 z"
-         sodipodi:ry="5"
-         sodipodi:rx="4"
-         sodipodi:cy="17"
-         sodipodi:cx="30"
-         id="path2626"
-         style="opacity:1;fill:url(#linearGradient4160);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4162);stroke-width:0.5189293;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccsccc"
-         id="path2831"
-         d="M 29.623023,21.222634 C 28.593441,22.577351 27.590541,21.797393 27.590541,21.797393 C 28.475104,24.665098 30.689201,26.182235 33.033249,25.554148 C 34.106395,25.266597 34.901224,24.758385 35.447228,23.751569 L 35.485546,23.023541 L 29.623023,21.222634 z "
-         style="opacity:1;fill:url(#linearGradient4207);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csscssss"
-         id="path2628"
-         d="M 30.100108,17.518382 C 31.131895,15.758277 34.219994,15.6834 35.805273,14.362334 C 37.990226,12.541536 38.051498,10.868058 39.924157,9.6282615 C 41.961066,8.2797255 46.843187,7.4433055 46.843187,7.4433055 C 46.843187,7.4433055 43.687138,9.7496487 42.351886,12.298764 C 41.016637,14.847878 41.75321,17.518384 39.568253,19.94611 C 37.592492,22.141399 34.285586,24.197637 32.770611,23.951864 C 29.071823,23.351811 29.068324,19.278485 30.100108,17.518382 z "
-         style="opacity:1;fill:url(#linearGradient4202);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4204);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="czzczzzz"
-         id="path2526"
-         d="M 31.679181,17.97931 C 32.574418,17.030401 35.093585,16.422001 36.463532,15.479212 C 37.83348,14.536425 38.720706,11.956413 40.132426,10.774594 C 41.565039,9.5752793 42.924313,9.4393424 42.924313,9.4393424 C 42.924313,9.4393424 41.913297,9.8428291 40.860744,11.260138 C 39.80819,12.67745 40.044439,14.98513 37.899342,17.192086 C 35.754247,19.399041 33.239502,20.515698 32.129172,20.485509 C 31.018843,20.455318 30.783944,18.928219 31.679181,17.97931 z "
-         style="opacity:1;fill:url(#linearGradient4199);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58725345;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="czczcc"
-         id="path2787"
-         d="M 8.9286277,32.901666 C 8.9286277,32.901666 7.4127364,10.037287 18.159512,7.9560372 C 28.885553,5.8788029 32.237595,12.284458 32.237595,12.284458 C 32.237595,12.284458 27.046509,7.2547492 19.96025,9.3804843 C 12.799145,11.528672 12.463056,28.197511 12.463056,28.197511 C 10.619177,29.119452 8.9286277,32.901666 8.9286277,32.901666 z "
-         style="opacity:1;fill:url(#linearGradient4194);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4196);stroke-width:0.59999919;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccscsz"
-         id="path2809"
-         d="M 9.5681082,29.724949 C 9.5681082,29.724949 11.410521,27.557404 11.410521,27.557404 C 11.410521,27.557404 11.729076,15.804241 15.439075,11.644545 C 19.015524,7.6345878 20.276605,8.2662566 20.276605,8.2662566 C 20.276605,8.2662566 14.807405,7.649992 11.844032,14.877267 C 10.429273,18.327671 9.5042981,25.416711 9.5681082,29.724949 z "
-         style="opacity:1;fill:url(#linearGradient4191);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         transform="matrix(1.495931,0,0,1.495931,-8.549852,-5.48321)"
-         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
-         sodipodi:ry="0.77002507"
-         sodipodi:rx="0.84002739"
-         sodipodi:cy="20.979118"
-         sodipodi:cx="15.820516"
-         id="path3325"
-         style="opacity:1;fill:url(#radialGradient4178);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#radialGradient4180);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path3329"
-         sodipodi:cx="15.820516"
-         sodipodi:cy="20.979118"
-         sodipodi:rx="0.84002739"
-         sodipodi:ry="0.77002507"
-         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
-         transform="matrix(1.495931,0,0,1.495931,-7.787695,-10.97075)" />
-    </g>
-  </g>
-</svg>
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 1fe2c2d65ecfe59f1c8df9a8f3c26c55c7f2c69f..d19119165ebd6c34f14d8f73c9b6b0cc2446f4fd 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr ""
 
@@ -29,7 +29,7 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -114,7 +114,7 @@ msgstr ""
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -192,22 +192,22 @@ msgid "The desired thumbnail size"
 msgstr ""
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -224,7 +224,7 @@ msgid ""
 "Do you want to skip it?"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr ""
 
@@ -831,16 +831,16 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr ""
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr ""
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr ""
 
@@ -1164,8 +1164,11 @@ msgid "Emblems"
 msgstr ""
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+msgid " Bytes)"
 msgstr ""
 
 #. display an error message
@@ -1174,6 +1177,18 @@ msgstr ""
 msgid "Failed to rename `%s'"
 msgstr ""
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1450,226 +1465,226 @@ msgstr ""
 msgid "_Empty File"
 msgstr ""
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr ""
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr ""
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr ""
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr ""
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "Reload the current folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr ""
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "Go to the home folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "Go to the templates folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr ""
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr ""
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr ""
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "St_atusbar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr ""
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr ""
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1679,21 +1694,21 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 msgid "Failed to open templates folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 8d512cd74988237b7855cc5bb5079da4d940794f..ffc71fcd8722f9cb63fbca9e3eab8f3c251e9919 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-01-29 15:14+0900\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Recol·lectant fitxers..."
 
@@ -30,7 +30,7 @@ msgstr "Recol·lectant fitxers..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -125,7 +125,7 @@ msgstr "No s'ha pogut saber l'estat del fitxer `%s': %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -208,22 +208,22 @@ msgid "The desired thumbnail size"
 msgstr "Tamany de les miniatures"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "S'està suprimint directoris..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "No s'ha pogut suprimir el directori `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "No s'ha pogut suprimir `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "No s'ha pogut transferí el directori arrel"
 
@@ -243,7 +243,7 @@ msgstr ""
 "\n"
 "El voleu ometre?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "Camí invàlid"
 
@@ -877,16 +877,16 @@ msgstr "Obre la ubicació"
 msgid "_Location:"
 msgstr "_Ubicació:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Ha fallat"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Mida d'icona"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 #, fuzzy
 msgid "The icon size for the path entry"
 msgstr "icona mida per"
@@ -1253,8 +1253,12 @@ msgid "Emblems"
 msgstr "Distintius"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "Octets"
 
 #. display an error message
@@ -1263,6 +1267,18 @@ msgstr "Octets"
 msgid "Failed to rename `%s'"
 msgstr "Ha fallat"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1577,248 +1593,248 @@ msgstr ""
 msgid "_Empty File"
 msgstr "Copia Fitxer"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Fitxers"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Obre una nova _finestra"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 #, fuzzy
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Obre a nou finestra per"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Ta_nca totes les finestres"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 #, fuzzy
 msgid "Close all Thunar windows"
 msgstr "Tanca tot finestres"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Tanca aquesta finestra"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "Pr_efercències"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Edita preferències Thunar"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Obre la carpeta pare"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Ubicació"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "Barres lateral_s"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Vés"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "Obre el _pare"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Obre la carpeta pare"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "_Home"
 msgstr "_Inici"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Obre inici"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Vés a la carpeta visitada posteriorment"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "Obre una _ubicació..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Indiqueu una ubicació a obrir"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 #, fuzzy
 msgid "Display information about Thunar"
 msgstr "Pantalla quant a"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostra els fitxers _ocults"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "Toggles the display of hidden files in the current window"
 msgstr "de in finestra"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "text"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 #, fuzzy
 msgid "_Shortcuts"
 msgstr "Dreceres"
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "Amagad_a"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Estil"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 #, fuzzy
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "amb"
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Estil"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 #, fuzzy
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Tradicional amb i"
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr "No mostris cap selector d'ubicació"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Visualitza com a _icones"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 #, fuzzy
 msgid "Display folder content in an icon view"
 msgstr "Pantalla in icona"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 #, fuzzy
 msgid "View as _Detailed List"
 msgstr "Visualització Llista"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 #, fuzzy
 msgid "Display folder content in a detailed list view"
 msgstr "Pantalla in a llista"
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Ha fallat obre pare"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Ha fallat obre inici"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1828,24 +1844,24 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 #, fuzzy
 msgid "Do _not display this message again"
 msgstr "no"
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Ha fallat obre pare"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 #, fuzzy
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr "és a i fitxer Escriptori."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr ""
 "Softcatalà <tradgnome@softcatala.org>\n"
diff --git a/po/de.po b/po/de.po
index 7fd73d60036a988911f1aead18a0510bbd87ddde..3dbdff38adcb617b0053967bfbe160d67bb20b88 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-02-05 23:10+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr ""
 
@@ -28,7 +28,7 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -121,7 +121,7 @@ msgstr ""
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -199,22 +199,22 @@ msgid "The desired thumbnail size"
 msgstr "Die gewünschte Thumbnail Größe"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Verzeichnisse werden gelöscht..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Konnte Verzeichnis »%s« nicht löschen: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Konnte Datei »%s« nicht löschen: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Das Wurzelverzeichnis kann nicht verschoben oder kopiert werden"
 
@@ -231,7 +231,7 @@ msgid ""
 "Do you want to skip it?"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "Ungültiger Pfad"
 
@@ -843,16 +843,16 @@ msgstr "Ort öffnen"
 msgid "_Location:"
 msgstr "_Ort:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Konnte »%s« nicht ausführen"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr ""
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr ""
 
@@ -1179,8 +1179,12 @@ msgid "Emblems"
 msgstr "Embleme"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%lld Byte)"
 
 #. display an error message
@@ -1189,6 +1193,18 @@ msgstr "%s (%lld Byte)"
 msgid "Failed to rename `%s'"
 msgstr "Die Datei »%s« konnte nicht umbenannt werden"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1466,226 +1482,226 @@ msgstr "Keine Vorlagen installiert"
 msgid "_Empty File"
 msgstr "_Leere Datei"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Datei"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "_Neues Fenster öffnen"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Ein weiteres Fenster für diesen Ort öffnen"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "_Alle Fenster schließen"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Alle Thunar Fenster schließen"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Schließen"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "_Einstellungen..."
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr "Thunars Einstellungen bearbeiten"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Anzeige"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr "_Neu laden"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "Reload the current folder"
 msgstr "Das aktuelle Verzeichnis neuladen"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr "Ver_größern"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr "Ver_kleinern"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr "_Normale Größe"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "_Eltern-Ordner öffnen"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Den Eltern-Ordner öffnen"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Persönlicher Ordner"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "Go to the home folder"
 msgstr "Zum persönlichen Ordner gehen"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr "_Vorlagen"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "Go to the templates folder"
 msgstr "Zum Vorlagenordner gehen"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "_Ort öffnen..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Einen Ort eingeben, der geöffnet werden soll"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "Ü_ber"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Würdigungen für die Schöpfer von Thunar anzeigen"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "_Verborgene Dateien anzeigen"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Verborgene Dateien im momentan geöffneten Fenster anzeigen/verbergen"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "St_atusbar"
 msgstr "St_atusleiste"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr "Die Sichtbarkeit der Statusleiste dieses Fensters ändern"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "_Verstecken"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "_Symbolansicht"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "_Detailansicht"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr "Der Eltern-Ordner konnte nicht geöffnet werden"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Der persönliche Ordner konnte nicht geöffnet werden"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr "Ãœber Vorlagen"
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1695,21 +1711,21 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr "Diese Meldung in Zukunft _nicht mehr anzeigen"
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 msgid "Failed to open templates folder"
 msgstr "Das Verzeichnis mit den Vorlagen konnte nicht geöffnet werden"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Benedikt Meurer <benny@xfce.org>"
 
diff --git a/po/el.po b/po/el.po
index 741aa9efd2a629be0a61b3c2468482e430d8a99b..0115a3b113995fc6aa6abd4b84bfa3cfb37861ca 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-02-05 00:53+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Συλλογή αρχείων..."
 
@@ -30,7 +30,7 @@ msgstr "Συλλογή αρχείων..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -125,7 +125,7 @@ msgstr "Δεν ήταν δυνατή η λήψη της κατάστασης τ
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -208,22 +208,22 @@ msgid "The desired thumbnail size"
 msgstr "Το επιθυμητό μέγεθος μικρογραφιών"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Διαγραφή καταλόγων..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του καταλόγου `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Δεν είναι δυνατή η μεταφορά του ριζικού(root) καταλόγου"
 
@@ -243,7 +243,7 @@ msgstr ""
 "\n"
 "Θέλετε να το προσπεράσετε;"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "Μη έγκυρη διαδρομή"
 
@@ -862,16 +862,16 @@ msgstr "Άνοιγμα Τοποθεσίας"
 msgid "_Location:"
 msgstr "_Τοποθεσία:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Η εκκίνηση του `%s' απέτυχε"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Μέγεθος εικονιδίου"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr "Μέγεθος εικονιδίου για τη διαδρομή"
 
@@ -1205,8 +1205,11 @@ msgid "Emblems"
 msgstr "Εμβλήματα"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+msgid " Bytes)"
 msgstr ""
 
 #. display an error message
@@ -1215,6 +1218,18 @@ msgstr ""
 msgid "Failed to rename `%s'"
 msgstr "Η μετονομασία του `%s' απέτυχε"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1497,229 +1512,229 @@ msgstr "Δεν υπάρχουν εγκατεστημένα πρότυπα"
 msgid "_Empty File"
 msgstr "_Κενό Αρχείο"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Άνοιγμα νέου _παραθύρου"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 "'Ανοιγμα ενός άλλου παράθυρου του Thunar για την προβαλλόμενη τοποθεσία"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Κλείσιμο _Όλων των Παραθύρων"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Κλείσιμο όλων των παραθύρων του Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Κλείσιμο αυτού του παραθύρου"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "_Προτιμήσεις..."
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr "Επεξεργασία Προτιμήσεων του Thunar"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr "Α_νανέωση"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "Reload the current folder"
 msgstr "Ανανέωση του τρέχοντος φακέλου"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr "Εργαλειοθήκη _Τοποθεσίας"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "_Πλευρικό Ταμπλό"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr "_Μεγέθυνση"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr "Εμφάνιση των περιεχομένων με περισσότερη λεπτομέρεια"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr "Σ_μίκρυνση"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr "Εμφάνιση των περιεχομένων με λιγότερη λεπτομέρεια"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr "_Κανονικό Μέγεθος"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr "Εμφάνιση των περιεχομένων στο κανονικό μέγεθος"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "Άνοιγμα _Γονικού"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Άνοιγμα του γονικού φακέλου"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Αρχή"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "Go to the home folder"
 msgstr "Μετάβαση στον αρχικό κατάλογο"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr "_Πρότυπα"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "Go to the templates folder"
 msgstr "Μετάβαση στο φάκελο προτύπων"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "Άνοιγμα _Τοποθεσίας..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Καθορίστε μια τοποθεσία για άνοιγμα"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Περί"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "Εμφάνιση _Κρυφών Αρχείων"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Εναλλάσσει την εμφάνιση κρυφών αρχείων στο τρέχον παράθυρο"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "St_atusbar"
 msgstr "Γ_ραμμή Κατάστασης"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr "Αλλαγή της ορατότητας της μπάρας κατάστασης του παραθύρου αυτού"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr "_Συντομεύσεις"
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "Κ_ρυφό"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr "_Μπάρα Τοποθεσίας"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Σύγχρονη προσέγγιση με κουμπιά που αντιστοιχούν σε φακέλους"
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr "_Εργαλειοθήκη"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Παραδοσιακή προσέγγιση με μπάρα τοποθεσίας και κουμπιά περιήγησης"
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr "Χωρίς επιλογέα τοποθεσίας"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Ε_ικονίδια"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως εικονίδια"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "_Λεπτομέρειες"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως λεπτομερή λίστα"
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr "Το άνοιγμα του γονικού φακέλου απέτυχε"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Αδυναμία ανοίγματος αρχικού καταλόγου"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr "Περί Προτύπων"
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 "Όλα τα αρχεία σε αυτόν τον κατάλογο θα εμφανιστούν στο μενού \"Δημιουργία "
 "Εγγράφου\"."
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1729,15 +1744,15 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr "_Να μην εμφανιστεί ξανά αυτό το μήνυμα"
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 msgid "Failed to open templates folder"
 msgstr "Το άνοιγμα του φακέλου προτύπων απέτυχε"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1745,7 +1760,7 @@ msgstr ""
 "Ο Thunar είναι ένας γρήγορος και εύκολος διαχειριστής αρχείων\n"
 "για το Περιβάλλον Εργασίας Xfce."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>"
 
diff --git a/po/es.po b/po/es.po
index a22a63718a46351f43530392769bcc737c6979be..24b7b7b898ac2d5d9fb1498451c2c25f8a81efae 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Pablo Hernández-M. Saiz <homeless3d@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr ""
 
@@ -28,7 +28,7 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -123,7 +123,7 @@ msgstr "Imposible renombrar %s."
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -205,23 +205,23 @@ msgid "The desired thumbnail size"
 msgstr ""
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 #, fuzzy
 msgid "Deleting directories..."
 msgstr "Borrando archivos..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, fuzzy, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Imposible crear el directorio %s."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, fuzzy, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Imposible eliminar %s."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "¿Quiere dejarlo como está?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 #, fuzzy
 msgid "Invalid path"
 msgstr "Nombre de archivo inválido"
@@ -869,16 +869,16 @@ msgstr "Abrir dirección..."
 msgid "_Location:"
 msgstr "_Dirección"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Tamaño de icono"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr ""
 
@@ -1213,8 +1213,12 @@ msgid "Emblems"
 msgstr ""
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
@@ -1223,6 +1227,18 @@ msgstr "%s (%u Bytes)"
 msgid "Failed to rename `%s'"
 msgstr "Imposible renombrar %s."
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1527,240 +1543,240 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copiar archivo"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Nueva _ventana"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Cerrar _todas las ventanas"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Cerrar todas las ventanas de Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Gestor de archivos"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Ver"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Barra de _dirección"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "Panel _lateral"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Ir a"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "Abrir _antecesor"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Abre la carpeta anterior"
 
 # msgstr "Sistema de archivos"
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "_Home"
 msgstr "Casa"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "Abrir _dirección..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Especificar una dirección para abrir"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Muestra información acerca de Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostrar los archivos _ocultos"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Texto de la barra de estado"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "_Oculto/a"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Estilo _tradicional"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Estilo _tradicional"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Ver como _Iconos"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "Ver como _Lista"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Abre la carpeta anterior"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Imposible abrir el directorio %s."
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1770,16 +1786,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1787,7 +1803,7 @@ msgstr ""
 "Thunar es un gestor de archivos rápido\n"
 "y fácil de usar para el escritorio Xfce"
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index eff580a3333ea7d567efedf5109e3ffa351895ca..b5dec51ce795ca1a1b7a6f87f7fc3e8d1b611d6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-01-01 15:02+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Récupération des fichiers..."
 
@@ -28,7 +28,7 @@ msgstr "Récupération des fichiers..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -123,7 +123,7 @@ msgstr "Échec pour récupérer le statut du fichier `%s' : %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -206,22 +206,22 @@ msgid "The desired thumbnail size"
 msgstr "La taille de vignette désirée"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Suppression des répertoires..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Impossible de supprimer le répertoire `%s' : %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Impossible de supprimer `%s' : %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Ne peut pas transférer le répertoire racine"
 
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "Voulez-vous l'ignorer ?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 #, fuzzy
 msgid "Invalid path"
 msgstr "Nom de fichier invalide"
@@ -865,16 +865,16 @@ msgstr "Aller à..."
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Échec au lancement de l'action `%s'."
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Taille d'icône"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr ""
 
@@ -1211,8 +1211,12 @@ msgid "Emblems"
 msgstr "Emblèmes"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u octets)"
 
 #. display an error message
@@ -1221,6 +1225,18 @@ msgstr "%s (%u octets)"
 msgid "Failed to rename `%s'"
 msgstr "Échec au changement de nom de `%s'"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1508,233 +1524,233 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copier le fichier"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Ouvrir une _nouvelle fenêtre"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Ouvre une nouvelle fenêtre de Thunar pour l'endroit affiché"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Fermer _toutes les fenêtres"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Ferme toutes les fenêtres de Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "Édit_er"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "Préfér_ences..."
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr "Éditer les préférences de Thunar"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Voir"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "_Panneau latéral"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Aller"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "Ouvrir le _père"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Répertoire personnel"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Ouvrir le répertoire personnel"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Aller vers le répertoire visité suivant"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "A_ller à..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Spécifier un chemin à ouvrir"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "À _propos"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Affiche des informations à propos de Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "Montrer les fichiers _cachés"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Montrer/cache les fichiers cachés dans la fenêtre courante"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Texte de la barre de statut"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr "_Raccourcis"
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "_Caché"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr "Style de la barre de _chemin"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Approche moderne avec les boutons qui correspondent aux dossiers"
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr "Style de la barre d'_outils"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 "Approche traditionnelle avec les la barre de chemin et les boutons de "
 "navigation"
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Voir en _icônes"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr "Affiche le contenu du dossier sous forme de vue d'icônes"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "Voir en liste _détaillée"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr "Affiche le contenu du dossier sous forme de liste détaillée"
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Ouvrir le dossier père"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Échec dans l'ouverture du répertoire personnel"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1744,16 +1760,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1761,7 +1777,7 @@ msgstr ""
 "Thunar est un gestionnaire de fichier rapide et facile\n"
 "d'utilisation pour l'Environnement de Bureau Xfce."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "crédits-traducteur"
 
diff --git a/po/hu.po b/po/hu.po
index 6fa1a31a5e62c06ab282cba603f6203aecd4324d..eb25bf1bdfc699525b758d65a072475e35792603 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2005-10-06 22:02+0900\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Fájlok gyűjtése..."
 
@@ -27,7 +27,7 @@ msgstr "Fájlok gyűjtése..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -122,7 +122,7 @@ msgstr "Nem törölhető: %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -204,23 +204,23 @@ msgid "The desired thumbnail size"
 msgstr ""
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 #, fuzzy
 msgid "Deleting directories..."
 msgstr "Fájlok gyűjtése..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, fuzzy, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Nem hozható létre ez a könyvtár: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, fuzzy, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 "Átugrod?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr ""
 
@@ -868,16 +868,16 @@ msgstr "Hely megnyitása"
 msgid "_Location:"
 msgstr "_Hely:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Ikon méret"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr "Az ösvényelem ikonmérete"
 
@@ -1211,8 +1211,12 @@ msgid "Emblems"
 msgstr ""
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u bájt)"
 
 #. display an error message
@@ -1221,6 +1225,18 @@ msgstr "%s (%u bájt)"
 msgid "Failed to rename `%s'"
 msgstr "Nem törölhető: %s"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1522,239 +1538,239 @@ msgstr ""
 msgid "_Empty File"
 msgstr "Fájl másolás"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Új _Ablak"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Új Thunar ablak az adott helyhez"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "_Minden ablak bezárása"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Bezár minden Thunar ablakot"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Bezárja ezt az ablakot"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "Sz_erkesztés"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Tulajdonságok"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Fájlkezelő"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 #, fuzzy
 msgid "_Location Selector"
 msgstr "_Címsor"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Ugrás"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "_Szülő megnyitása"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "_Home"
 msgstr "Saját könyvtár"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "_Hely megnyitása..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Adott hely megnyitása"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "A Thunar adatainak megjelenítése"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Rejtett fájlok mutatása"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "A rejtett fájlok mutatását váltja a jelen ablakban"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Állapotsor szöveg"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "_Rejtett"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "_Hagyományos stílus"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "_Hagyományos stílus"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Szülőmappa megnyitása"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nem megnyitható könyvtár: %s"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1764,22 +1780,22 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 7f95bf9696620f5379c0eaa5e8cd2b5e7b304737..aa92acfac05c73682869e26aad44b200eae28438 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-01-21 10:58+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Raccolta file in corso..."
 
@@ -31,7 +31,7 @@ msgstr "Raccolta file in corso..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -126,7 +126,7 @@ msgstr "Stat del file `%s' fallito: %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -210,22 +210,22 @@ msgid "The desired thumbnail size"
 msgstr "Dimensione desiderata della miniatura"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Eliminazione delle directory in corso..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Impossibile rimuovere la directory `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Impossibile eliminare `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Impossibile trasferire la directory radice"
 
@@ -245,7 +245,7 @@ msgstr ""
 "\n"
 "Si desidera saltarlo?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "Path non valida"
 
@@ -869,16 +869,16 @@ msgstr "Apri percorso"
 msgid "_Location:"
 msgstr "Percorso:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Impossibile lanciare `%s'"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Dimensione dell'icona"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr ""
 
@@ -1204,8 +1204,12 @@ msgid "Emblems"
 msgstr ""
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u Byte)"
 
 #. display an error message
@@ -1214,6 +1218,18 @@ msgstr "%s (%u Byte)"
 msgid "Failed to rename `%s'"
 msgstr "Impossibile rinominare `%s'"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1505,177 +1521,177 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copia file"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_File"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 #, fuzzy
 msgid "Open New _Window"
 msgstr "Apri nuova finestra"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Apri una nuova finestra di Thunar per il percorso mostrato"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 #, fuzzy
 msgid "Close _All Windows"
 msgstr "Chiudi tutte le finestre"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Chiudi tutte le finestre Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "_View"
 msgstr "Vista"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Apri la directory precedente"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Selettore di percorsi"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Pannello laterale"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 #, fuzzy
 msgid "_Go"
 msgstr "Vai"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Open _Parent"
 msgstr "Apri precedente"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Apri la directory precedente"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Home"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Apri la directory home"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Vai alla directory visitata successivamente"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 #, fuzzy
 msgid "Open _Location..."
 msgstr "Apri percorso..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 #, fuzzy
 msgid "Specify a location to open"
 msgstr "Specificare un percorso da aprire"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Informazioni su..."
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Mostra informazioni su Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 "Dis/abilita la visualizzazione di file nascosti nella finestra corrente"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Testo della barra di stato"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 #, fuzzy
 msgid "_Hidden"
 msgstr "Nascondi"
@@ -1683,64 +1699,64 @@ msgstr "Nascondi"
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Vedi come _icone"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "Vedi come lista _dettagliata"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr "Impossibile aprire la directory superiore"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Impossibile aprire la directory home"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1750,16 +1766,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Impossibile aprire la directory superiore"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1767,7 +1783,7 @@ msgstr ""
 "Thunar è un file manager veloce e facile\n"
 "da usare per Xfce Desktop Environment."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Roberto Pariset <r.pariset@gmail.com>"
 
diff --git a/po/ja.po b/po/ja.po
index 66f8dd0e9fa6c7f7485b9413a24fc364b1b1bc4a..8f4b0069be8818f8884b6bb3aecc9006e2d5d3cb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-02-04 11:49+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "ファイルを集めています..."
 
@@ -35,7 +35,7 @@ msgstr "ファイルを集めています..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -132,7 +132,7 @@ msgstr "ファイル「%s」の状態を取得するのに失敗しました: %s
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -215,22 +215,22 @@ msgid "The desired thumbnail size"
 msgstr "お望みのサムネイルサイズです。"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "フォルダを削除しています..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "フォルダ「%s」を作成できません: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "「%s」を削除できません: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "ルートフォルダを転送できません。"
 
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "これを飛ばしますか?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "無効なパスです。"
 
@@ -857,16 +857,16 @@ msgstr "開く位置を指定して下さい"
 msgid "_Location:"
 msgstr "フォルダの位置(_L):"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "「%s」の実行に失敗しました。"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "アイコンのサイズ"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr "パスエントリーのアイコンサイズです。"
 
@@ -1203,8 +1203,12 @@ msgid "Emblems"
 msgstr "シンボル"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%lld バイト)"
 
 #. display an error message
@@ -1213,6 +1217,18 @@ msgstr "%s (%lld バイト)"
 msgid "Failed to rename `%s'"
 msgstr "「%s」の名前変更に失敗しました。"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1489,228 +1505,228 @@ msgstr "テンプレートはインストールされていません"
 msgid "_Empty File"
 msgstr "空のファイル(_E)"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "新規ウィンドウを開く(_W)"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "表示されている場所のウィンドウを新しく開きます。"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "全ウィンドウを閉じる(_A)"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Thunar の全てのウィンドウを閉じます。"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "このウィンドウを閉じます。"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "環境設定(_P)..."
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr "Thunar の環境設定を変更します。"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr "再読込み(_R)"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "Reload the current folder"
 msgstr "現在のフォルダを再び読み込みます。"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr "位置セレクター(_L)"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "サイドペイン(_S)"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr "拡大(_I)"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr "アイコンおよびサムネイルを拡大表示します。"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr "アイコンおよびサムネイルを縮小表示します。"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr "普通のサイズ(_Z)"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr "アイコンおよびサムネイルを普通のサイズで表示します。"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "移動(_G)"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "上位フォルダを開く(_P)"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "上の階層にあるフォルダを開きます。"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "ホーム(_H)"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "Go to the home folder"
 msgstr "ホームフォルダに移動します。"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr "テンプレート(_E)"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "Go to the templates folder"
 msgstr "テンプレートフォルダに移動します。"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "指定位置を開く(_L)..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "フォルダの位置を指定して開きます。"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "このプログラムについて(_A)"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Thunar についての情報を表示します。"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "隠しファイルを表示(_H)"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "現在のウィンドウで隠しファイルの表示/非表示を切り替えます。"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "St_atusbar"
 msgstr "ステータスバー(_A)"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr "ウィンドウのステータスバーを表示/隠します。"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr "ショートカット(_S)"
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "表示しない(_H)"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr "パスボタン方式(_T)"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "フォルダに対応するボタンを表示する今風の表示方式です。"
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr "ツールバー方式(_T)"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "位置バーおよびナビゲーションボタンを表示する旧来の表示方式です。"
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr "いずれの位置セレクターも表示しません。"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "アイコン表示(_I)"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr "フォルダの内容をアイコンで表示します。"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "リスト表示(_D)"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr "フォルダの内容を詳細なリストで表示します。"
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr "上位のフォルダを開くのに失敗しました。"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "ホームフォルダを開くのに失敗しました。"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr "テンプレートについて"
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 "このフォルダにある全てのファイルは\n"
 "メニュー「文書を作成」に表示されます。"
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1726,15 +1742,15 @@ msgstr ""
 "その後で「文書を作成」メニューからこの項目を選択する事ができ、御覧になってい"
 "るフォルダに文書のコピーが作成されます。"
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr "このメッセージを再び表示しない(_N)"
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 msgid "Failed to open templates folder"
 msgstr "テンプレートフォルダを開くのに失敗しました。"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1742,7 +1758,7 @@ msgstr ""
 "Thunar は Xfce デスクトップ環境向けの\n"
 "使いやすい軽快なファイルマネージャーです。"
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Daichi Kawahata <daichi@xfce.org>"
 
diff --git a/po/nl.po b/po/nl.po
index a15d19d150213169e464469ccbd5e66b149ef9b1..21fca7704ef94495d6caac6ffe595d46ecbe2bee 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-01-31 14:07+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Bestanden aan het ophalen..."
 
@@ -28,7 +28,7 @@ msgstr "Bestanden aan het ophalen..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -131,7 +131,7 @@ msgstr "Het <stat> van bestand `%s' is mislukt: %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -214,22 +214,22 @@ msgid "The desired thumbnail size"
 msgstr "Voorkeursgrootte van voorproef pictogrammen"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Mappen aan het verwijderen..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Fout bij het verwijderen van de map `%s' : %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Fout bij het verwijderen van `%s' : %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Kan de hoofdmap niet verplaatsen"
 
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "Wilt u het overslaan?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "Ongeldig pad"
 
@@ -872,16 +872,16 @@ msgstr "Locatie Openen"
 msgid "_Location:"
 msgstr "_Locatie"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Het openen van `%s' is mislukt"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Icoongrootte"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr "Icoongrootte voor pad invoer"
 
@@ -1218,8 +1218,12 @@ msgid "Emblems"
 msgstr "Emblemen"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
@@ -1228,6 +1232,18 @@ msgstr "%s (%u Bytes)"
 msgid "Failed to rename `%s'"
 msgstr "Fout bij het wijzigen van de naam van `%s'"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1513,228 +1529,228 @@ msgstr "Geen Sjablonen geïnstalleerd"
 msgid "_Empty File"
 msgstr "_Leeg Bestand"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Nieuw _Venster Openen"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Een nieuw Thunar-venster openen voor de weergegeven locatie"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "_Alle Vensters Sluiten"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Alle Thunar-vensters sluiten"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Aanpassen"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "Vo_orkeuren"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr "Voorkeuren van Thunar aanpassen"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Weergavemodus"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr "_Verversen"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "Reload the current folder"
 msgstr "Huidige map herladen"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr "_Locatie Selecteerder"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "_Zijpaneel"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr "_Inzoomen"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr "Inhoud gedetailleerder weergeven"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr "_Uitzoomen"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr "Inhoud minder gedetailleerd weergeven"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr "Normale Gr_ootte"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr "Inhoud op normale grootte weergeven"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Gaan"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "_Bovenliggende Map Openen"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "De bovenliggende map openen"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Persoonlijke Map"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "Go to the home folder"
 msgstr "Persoonlijke map openen"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr "S_jablonen"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "Go to the templates folder"
 msgstr "Ga naar de sjablonen map"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "_Locatie Openen..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Geef een locatie om te openen op"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Help"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Over..."
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Geef informatie over Thunar weer"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "_Verborgen Bestanden Weergeven"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Schakelt het weergeven van verborgen bestanden aan/uit"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "St_atusbar"
 msgstr "St_atusbalk"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr "Zichtbaarheid van de statusbalk van dit venster veranderen"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr "_Sneltoetsen"
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "_Verborgen"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr "_Padbalk stijl"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Moderne benadering met knoppen die overeenkomen met mappen."
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr "_Werkbalk Stijl"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Traditionele benadering met locatiebalk en navigatieknoppen"
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr "Geen locatieselecteerder weergeven"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Bekijken als _Iconen"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr "Mapinhoud in icoon weergavemodus weergeven"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "Weergeven als _Gedetailleerde lijst"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr "Mapinhoud weergeven als gedetailleerde lijst"
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr "Fout bij het openen van de bovenliggende map"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Fout bij het openen van de persoonlijke map"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr "Over Sjablonen..."
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 "Alle bestanden in deze mappen zullen verschijnen in het \"Nieuw Document\" "
 "menu."
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 #, fuzzy
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
@@ -1751,16 +1767,16 @@ msgstr ""
 "U kunt het dan selecteren in het \"Nieuw Document\" menu, waarop een kopie "
 "van dit document wordt gemaakt naar de map die u op dat moment bekijkt."
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr "_Niet weer vragen"
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 msgid "Failed to open templates folder"
 msgstr "Fout bij het openen van de sjablonen map"
 
 # Desktop Environment in Dutch?
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 #, fuzzy
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
@@ -1769,7 +1785,7 @@ msgstr ""
 "Thunar is een snelle en gemakkelijke bestandsbeheerder\n"
 "voor de Xfce Bureaubladomgeving."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Vincent Tunru <imnotb@gmail.com>"
 
diff --git a/po/pl.po b/po/pl.po
index acfe2a25bc0c3ca648f7bf9dd12b8a26c8459fbb..a694a9fad9c7745b56a7c4099973b411e94f5794 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-01-13 14:21+0100\n"
 "Last-Translator: Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "WyszukujÄ™ pliki..."
 
@@ -28,7 +28,7 @@ msgstr "WyszukujÄ™ pliki..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -123,7 +123,7 @@ msgstr "Nie mogę odczytać atrybutów pliku '%s': %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -205,22 +205,22 @@ msgid "The desired thumbnail size"
 msgstr "Rozmiar miniaturki"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Usuwam katalogi..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Nie można usunąć katalogu '%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Nie mogę usunąć pliku '%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Nie mogę przenieść katalogu głównego"
 
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 "Czy chcesz go pominąć?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 #, fuzzy
 msgid "Invalid path"
 msgstr "Nieprawidłowa nazwa pliku"
@@ -876,16 +876,16 @@ msgstr "Otwórz plik/katalog"
 msgid "_Location:"
 msgstr "Położenie:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Nie udało się usunąć '%s'"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Rozmiar ikony"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr "Rozmiar ikony dla elementów ścieżki"
 
@@ -1223,8 +1223,12 @@ msgid "Emblems"
 msgstr "Symbole"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u bajtów)"
 
 #. display an error message
@@ -1233,6 +1237,18 @@ msgstr "%s (%u bajtów)"
 msgid "Failed to rename `%s'"
 msgstr "Nie udało się zmienić nazwy %s."
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1525,236 +1541,236 @@ msgstr ""
 msgid "_Empty File"
 msgstr "S_kopiuj plik"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Plik"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Otwórz nowe _okno"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Otwórz wyświetlaną zawartość w nowym oknie"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Zamknij wszystkie okna"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Zamknij wszystkie okna menedżera plików Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Widok"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Pasek _położenia"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "Panel _boczny"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "W _górę"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "_Home"
 msgstr "Katalog domowy"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Przejdź do następnego katalogu"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "Otwórz plik/katalog..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Podaj położenie pliku/katalogu do otwarcia"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Wyświetl informacje o programie Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "Pokaż _ukryte pliki"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Włącza/wyłącza pokazywanie ukrytych plików"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Tekst paska statusu"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "Niewidoczny"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Styl tradycyjny"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Styl tradycyjny"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Widok _ikon"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "Widok _szczegółowy"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Otwórz katalog nadrzędny"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1764,16 +1780,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1781,7 +1797,7 @@ msgstr ""
 "Thunar to szybki i łatwy w użyciu menedżer plików\n"
 "dla środowiska Xfce Desktop Environment."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 70e59676b518f59a7bfa8854da65428b2a0c079a..f43144e7a114133be33899f8c7007f83b466bde5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2005-11-17 16:55+0900\n"
 "Last-Translator: Joao Pedrosa <joaopedrosa@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr "Coletando arquivos..."
 
@@ -28,7 +28,7 @@ msgstr "Coletando arquivos..."
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -123,7 +123,7 @@ msgstr "Falha em \"stat\" arquivo `%s': %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -205,22 +205,22 @@ msgid "The desired thumbnail size"
 msgstr "O tamanho de miniatura desejado"
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Deletando diretórios..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Incapaz de remover diretório `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Incapaz de remover `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 msgid "Cannot transfer the root directory"
 msgstr "Não pode transferir o diretório raiz"
 
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 "Você quer pulá-lo?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 #, fuzzy
 msgid "Invalid path"
 msgstr "Nome de arquivo inválido"
@@ -859,16 +859,16 @@ msgstr "Abrir Endereço"
 msgid "_Location:"
 msgstr "_Endereço:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Falha em lançar operação"
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr "Tamanho de ícone"
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr "O tamanho de ícone para a entrada de caminho"
 
@@ -1205,8 +1205,12 @@ msgid "Emblems"
 msgstr "Emblemas"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u Bytes)"
 
 #. display an error message
@@ -1215,6 +1219,18 @@ msgstr "%s (%u Bytes)"
 msgid "Failed to rename `%s'"
 msgstr "Falha em renomear `%s'"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1506,233 +1522,233 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copiar Arquivo"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Abrir Nova _Janela"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Abrir uma nova janela Thunar para o endereço mostrado"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Fechar Tod_as as Janelas"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Fechar todas as janelas Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "Fe_char"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "_Preferências"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Editar Preferências do Thunar"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Visualização"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr "_Seletor de Endereço"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "_Painel Lateral"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "Abrir _Pai"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Pasta Inicial"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Abrir a pasta inicial"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr "Abrir _Endereço..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr "Especifique um endereço para abrir"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Mostrar informação sobre o Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "Mostrar Arquivos Invisíveis"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Alterna a mostragem de arquivos invisíveis na janela atual"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Texto da barra de status"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 msgid "_Hidden"
 msgstr "_Invisíveis"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr "E_stilo da Barra de Caminho"
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Estilo moderno com botões que correspondem a pastas"
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr "Es_tilo Barra de Ferramentas"
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Estilo tradicional com barra de endereço e botões de navegação"
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr "Não mostre qualquer seletor de endereço"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr "Visualizar como Ícones"
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr "Mostrar conteúdo de pasta em uma visualização de ícone"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr "Visualizar como Lista _Detalhada"
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr "Mostrar conteúdo de pasta em uma visualização de lista detalhada"
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Abrir a pasta pai"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Falha em abrir diretório inicial"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1742,16 +1758,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1759,7 +1775,7 @@ msgstr ""
 "Thunar é um gerenciador de arquivos fácil de usar e rápido\n"
 "para o Ambiente de Área de Trabalho Xfce."
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr "Créditos de tradutores"
 
diff --git a/po/ru.po b/po/ru.po
index d722abc693d432a68318ca874449cb09099441a4..4b569b7720833c6d2fe2f177060462f7acc90d64 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"POT-Creation-Date: 2006-02-06 18:18+0100\n"
 "PO-Revision-Date: 2006-01-29 17:47+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:168
 #: ../thunar-vfs/thunar-vfs-chown-job.c:166
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:267
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:270
 msgid "Collecting files..."
 msgstr ""
 
@@ -30,7 +30,7 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-chmod-job.c:189
 #: ../thunar-vfs/thunar-vfs-chown-job.c:187
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:747
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:784
 #, c-format
 msgid ""
 "%s.\n"
@@ -124,7 +124,7 @@ msgstr ""
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:727
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:764
 #, c-format
 msgid ""
 "%s.\n"
@@ -207,22 +207,22 @@ msgid "The desired thumbnail size"
 msgstr ""
 
 #. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:329
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:366
 msgid "Deleting directories..."
 msgstr "Удаление каталогов..."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:349
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:386
 #, c-format
 msgid "Unable to remove directory `%s': %s"
 msgstr "Не удалось удалить каталог `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:627
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:680
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:664
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:717
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Не удалось удалить `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:873
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:910
 #, fuzzy
 msgid "Cannot transfer the root directory"
 msgstr "Переместить корневой каталог невозможно"
@@ -243,7 +243,7 @@ msgstr ""
 "\n"
 "Пропустить?"
 
-#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1220
+#: ../thunar-vfs/thunar-vfs-util.c:68 ../thunar/thunar-path-entry.c:1252
 msgid "Invalid path"
 msgstr "Неверный путь"
 
@@ -867,16 +867,16 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1475
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr ""
 
-#: ../thunar/thunar-path-entry.c:250
+#: ../thunar/thunar-path-entry.c:255
 msgid "Icon size"
 msgstr ""
 
-#: ../thunar/thunar-path-entry.c:251
+#: ../thunar/thunar-path-entry.c:256
 msgid "The icon size for the path entry"
 msgstr ""
 
@@ -1205,8 +1205,12 @@ msgid "Emblems"
 msgstr "Эмблемы"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
-msgid "%s (%lld Bytes)"
+msgid "%s (%"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:767
+#, fuzzy
+msgid " Bytes)"
 msgstr "%s (%u байт)"
 
 #. display an error message
@@ -1215,6 +1219,18 @@ msgstr "%s (%u байт)"
 msgid "Failed to rename `%s'"
 msgstr "Не удалось переименовать `%s'"
 
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:400
+msgid "Add Folder to _Shortcuts"
+msgid_plural "Add Folders to _Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-shortcuts-pane.c:94 ../thunar/thunar-shortcuts-pane.c:402
+msgid "Add the selected folder to the shortcuts side pane"
+msgid_plural "Add the selected folders to the shortcuts side pane"
+msgstr[0] ""
+msgstr[1] ""
+
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
 msgid "_Mount Volume"
@@ -1499,169 +1515,169 @@ msgstr "Нет шаблонов"
 msgid "_Empty File"
 msgstr "Пустой _файл"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:217
 msgid "_File"
 msgstr "_Файл"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 msgid "Open New _Window"
 msgstr "Открыть _новое окно"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:218
 #, fuzzy
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Открыть новое окно Thunar для текущего адреса"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close _All Windows"
 msgstr "Закрыть вс_е окна"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:219
 msgid "Close all Thunar windows"
 msgstr "Закрыть все окна Thunar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:220
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:221
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Pr_eferences..."
 msgstr "_Настройки..."
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:222
 msgid "Edit Thunars Preferences"
 msgstr "Редактировать настройки Thunar"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:223
 msgid "_View"
 msgstr "_Вид"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Открыть родительский каталог"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:225
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:226
 msgid "_Side Pane"
 msgstr "_Боковая панель"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:229
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:230
 msgid "_Go"
 msgstr "_Переход"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open _Parent"
 msgstr "_Родительский каталог"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:231
 msgid "Open the parent folder"
 msgstr "Открыть родительский каталог"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 msgid "_Home"
 msgstr "_Домашний каталог"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Открыть домашний каталог"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "T_emplates"
 msgstr "_Шаблоны"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Перейти в каталог шаблонов"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Open _Location..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:234
 msgid "Specify a location to open"
 msgstr ""
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:235
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "_About"
 msgstr "_О программе"
 
-#: ../thunar/thunar-window.c:235
+#: ../thunar/thunar-window.c:236
 msgid "Display information about Thunar"
 msgstr "Показать информацию о Thunar"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 msgid "Show _Hidden Files"
 msgstr "Показывать _скрытые файлы"
 
-#: ../thunar/thunar-window.c:240
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Показывать скрытые файлы"
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "St_atusbar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:241
+#: ../thunar/thunar-window.c:242
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:477
+#: ../thunar/thunar-window.c:478
 #, fuzzy
 msgid "_Shortcuts"
 msgstr "_Значки"
 
-#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:484 ../thunar/thunar-window.c:507
 #, fuzzy
 msgid "_Hidden"
 msgstr "_Скрыть"
@@ -1669,64 +1685,64 @@ msgstr "_Скрыть"
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:492
+#: ../thunar/thunar-window.c:493
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:493
+#: ../thunar/thunar-window.c:494
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:499
+#: ../thunar/thunar-window.c:500
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:500
+#: ../thunar/thunar-window.c:501
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:506
+#: ../thunar/thunar-window.c:507
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:515
+#: ../thunar/thunar-window.c:516
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:522
+#: ../thunar/thunar-window.c:523
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1277
+#: ../thunar/thunar-window.c:1289
 msgid "Failed to open parent folder"
 msgstr "Не удалось открыть родительский каталог"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1303
+#: ../thunar/thunar-window.c:1315
 msgid "Failed to open home directory"
 msgstr "Не удалось открыть домашний каталог"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1365
+#: ../thunar/thunar-window.c:1377
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1386
+#: ../thunar/thunar-window.c:1398
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1393
+#: ../thunar/thunar-window.c:1405
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1736,22 +1752,22 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1405
+#: ../thunar/thunar-window.c:1417
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1418
+#: ../thunar/thunar-window.c:1430
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Не удалось открыть родительский каталог"
 
-#: ../thunar/thunar-window.c:1509
+#: ../thunar/thunar-window.c:1521
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1514
+#: ../thunar/thunar-window.c:1526
 msgid "translator-credits"
 msgstr ""
 "Андрей Федосеев <andrey.fedoseev@gmail.com>\n"
diff --git a/thunar-vfs/thunar-vfs-transfer-job.c b/thunar-vfs/thunar-vfs-transfer-job.c
index 938b30206f3ac3fedefb189073a9de7ccb51515a..ea84a8a2088ad2bc83286e0d64737254814fc8ac 100644
--- a/thunar-vfs/thunar-vfs-transfer-job.c
+++ b/thunar-vfs/thunar-vfs-transfer-job.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -52,6 +52,7 @@
 #include <glib/gstdio.h>
 #else
 #define g_lstat(path, statb) (lstat ((path), (statb)))
+#define g_rename(oldfilename, newfilename) (rename ((oldfilename), (newfilename)))
 #define g_rmdir(path) (rmdir ((path)))
 #define g_unlink(path) (unlink ((path)))
 #endif
@@ -257,8 +258,10 @@ thunar_vfs_transfer_job_execute (ThunarVfsJob *job)
 {
   ThunarVfsTransferPair *pair;
   ThunarVfsTransferJob  *transfer_job = THUNAR_VFS_TRANSFER_JOB (job);
+  gboolean               result;
   GError                *error;
   gchar                 *source_absolute_path;
+  gchar                 *target_absolute_path;
   gchar                 *display_name;
   GList                 *pairs;
   GList                 *tmp;
@@ -273,8 +276,42 @@ thunar_vfs_transfer_job_execute (ThunarVfsJob *job)
   /* collect pairs recursively */
   for (lp = pairs; lp != NULL; lp = lp->next)
     {
-      // FIXME: Error handling?
+      /* determine the current pair */
       pair = (ThunarVfsTransferPair *) lp->data;
+
+      /* check if we want to move files, and try rename() first */
+      if (G_UNLIKELY (transfer_job->move))
+        {
+          /* determine the absolute source and target paths */
+          source_absolute_path = thunar_vfs_path_dup_string (pair->source_path);
+          target_absolute_path = thunar_vfs_path_dup_string (pair->target_path);
+
+          /* perform the rename if the target does not already exist */
+          result = (!g_file_test (target_absolute_path, G_FILE_TEST_EXISTS) && (g_rename (source_absolute_path, target_absolute_path) == 0));
+
+          /* release the absolute source and target paths */
+          g_free (source_absolute_path);
+          g_free (target_absolute_path);
+
+          /* fallback to copy logic if the simple rename didn't work */
+          if (G_LIKELY (result))
+            {
+              /* schedule a "created" event for the target file */
+              thunar_vfs_monitor_feed (transfer_job->monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, pair->target_path);
+
+              /* schedule a "deleted" event for the source file */
+              thunar_vfs_monitor_feed (transfer_job->monitor, THUNAR_VFS_MONITOR_EVENT_DELETED, pair->source_path);
+            
+              /* add the target file to the new files list */
+              transfer_job->new_files = thunar_vfs_path_list_prepend (transfer_job->new_files, pair->target_path);
+
+              /* rename worked, no need to copy this pair */
+              thunar_vfs_transfer_job_free_pair (transfer_job, pair);
+              continue;
+            }
+        }
+
+      /* prepare the pair for copying */
       tmp = thunar_vfs_transfer_job_collect_pairs (transfer_job, pair, NULL);
       transfer_job->pairs = g_list_concat (transfer_job->pairs, tmp);
       transfer_job->pairs = g_list_append (transfer_job->pairs, pair);
diff --git a/thunar-vfs/thunar-vfs-volume.c b/thunar-vfs/thunar-vfs-volume.c
index 4b736e26440e4dde473df7187df6aa82bf787f98..3853dc7f83271ebd02d482c9753fa05a6496668d 100644
--- a/thunar-vfs/thunar-vfs-volume.c
+++ b/thunar-vfs/thunar-vfs-volume.c
@@ -183,6 +183,38 @@ thunar_vfs_volume_get_mount_point (ThunarVfsVolume *volume)
 
 
 
+/**
+ * thunar_vfs_volume_is_disc:
+ * @volume : a #ThunarVfsVolume instance.
+ *
+ * Determines whether @volume is a disc, which can be ejected.
+ * Applications should use this method to determine whether to
+ * thunar_vfs_volume_eject() or thunar_vfs_volume_unmount().
+ *
+ * Return value: %TRUE if @volume is a disc.
+ **/
+gboolean
+thunar_vfs_volume_is_disc (ThunarVfsVolume *volume)
+{
+  ThunarVfsVolumeKind kind;
+
+  g_return_val_if_fail (THUNAR_VFS_IS_VOLUME (volume), FALSE);
+
+  kind = thunar_vfs_volume_get_kind (volume);
+
+  switch (kind)
+    {
+    case THUNAR_VFS_VOLUME_KIND_CDROM:
+    case THUNAR_VFS_VOLUME_KIND_DVD:
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+
+
 /**
  * thunar_vfs_volume_is_mounted:
  * @volume : a #ThunarVfsVolume instance.
@@ -247,7 +279,7 @@ thunar_vfs_volume_is_ejectable (ThunarVfsVolume *volume)
  * @volume : a #ThunarVfsVolume instance.
  *
  * Determines whether @volume is a removable device, for example
- * a CD-ROM or a floppy drive.
+ * a CD-ROM, an USB stick or a floppy drive.
  *
  * Return value: %TRUE if @volume is a removable device, else %FALSE.
  **/
@@ -263,15 +295,12 @@ thunar_vfs_volume_is_removable (ThunarVfsVolume *volume)
   switch (kind)
     {
     case THUNAR_VFS_VOLUME_KIND_CDROM:
+    case THUNAR_VFS_VOLUME_KIND_DVD:
     case THUNAR_VFS_VOLUME_KIND_FLOPPY:
+    case THUNAR_VFS_VOLUME_KIND_USBSTICK:
       return TRUE;
 
-    case THUNAR_VFS_VOLUME_KIND_UNKNOWN:
-    case THUNAR_VFS_VOLUME_KIND_HARDDISK:
-      return FALSE;
-
     default:
-      g_assert_not_reached ();
       return FALSE;
     }
 }
diff --git a/thunar-vfs/thunar-vfs-volume.h b/thunar-vfs/thunar-vfs-volume.h
index 2b78f3f59c42a545fcd4c3fd9226b7d3ab87484f..e767a615904f310de9d0f4fe57a0bf91f32d038e 100644
--- a/thunar-vfs/thunar-vfs-volume.h
+++ b/thunar-vfs/thunar-vfs-volume.h
@@ -121,6 +121,7 @@ const gchar          *thunar_vfs_volume_get_name          (ThunarVfsVolume   *vo
 ThunarVfsVolumeStatus thunar_vfs_volume_get_status        (ThunarVfsVolume   *volume);
 ThunarVfsPath        *thunar_vfs_volume_get_mount_point   (ThunarVfsVolume   *volume);
 
+gboolean              thunar_vfs_volume_is_disc           (ThunarVfsVolume   *volume);
 gboolean              thunar_vfs_volume_is_mounted        (ThunarVfsVolume   *volume);
 gboolean              thunar_vfs_volume_is_present        (ThunarVfsVolume   *volume);
 gboolean              thunar_vfs_volume_is_ejectable      (ThunarVfsVolume   *volume);
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index e5c6f2cb9adf5a2392f2e4cca570107c38037563..82dea6c3005419ae4a8cb236facb99ccb2f22ad9 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -104,6 +104,7 @@ Thunar_SOURCES =							\
 	thunar-shortcuts-model.h					\
 	thunar-shortcuts-pane.c						\
 	thunar-shortcuts-pane.h						\
+	thunar-shortcuts-pane-ui.h					\
 	thunar-shortcuts-view.c						\
 	thunar-shortcuts-view.h						\
 	thunar-side-pane.c						\
@@ -121,6 +122,8 @@ Thunar_SOURCES =							\
 	thunar-text-renderer.h						\
 	thunar-throbber.c						\
 	thunar-throbber.h						\
+	thunar-throbber-fallback.c					\
+	thunar-throbber-fallback.h					\
 	thunar-thumbnail-frame.c					\
 	thunar-thumbnail-frame.h					\
 	thunar-thumbnail-generator.c					\
@@ -172,7 +175,9 @@ DISTCLEANFILES =							\
 	stamp-thunar-marshal.h						\
 	thunar-icon-view-ui.h						\
 	thunar-launcher-ui.h						\
+	thunar-shortcuts-pane-ui.h					\
 	thunar-standard-view-ui.h					\
+	thunar-throbber-fallback.c					\
 	thunar-thumbnail-frame.c					\
 	thunar-window-ui.h
 
@@ -180,10 +185,15 @@ BUILT_SOURCES =								\
 	$(thunar_built_sources)						\
 	thunar-icon-view-ui.h						\
 	thunar-launcher-ui.h						\
+	thunar-shortcuts-pane-ui.h					\
 	thunar-standard-view-ui.h					\
+	thunar-throbber-fallback.c					\
 	thunar-thumbnail-frame.c					\
 	thunar-window-ui.h
 
+thunar-throbber-fallback.c: $(srcdir)/thunar-throbber-fallback.png Makefile
+	(echo "#include <thunar/thunar-throbber-fallback.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_throbber_fallback $(srcdir)/thunar-throbber-fallback.png) > thunar-throbber-fallback.c
+
 thunar-thumbnail-frame.c: $(srcdir)/thunar-thumbnail-frame.png Makefile
 	(echo "#include <thunar/thunar-thumbnail-frame.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_thumbnail_frame $(srcdir)/thunar-thumbnail-frame.png) > thunar-thumbnail-frame.c
 
@@ -193,6 +203,9 @@ thunar-icon-view-ui.h: Makefile $(srcdir)/thunar-icon-view-ui.xml
 thunar-launcher-ui.h: Makefile $(srcdir)/thunar-launcher-ui.xml
 	exo-csource --static --name=thunar_launcher_ui $(srcdir)/thunar-launcher-ui.xml > thunar-launcher-ui.h
 
+thunar-shortcuts-pane-ui.h: Makefile $(srcdir)/thunar-shortcuts-pane-ui.xml
+	exo-csource --static --name=thunar_shortcuts_pane_ui $(srcdir)/thunar-shortcuts-pane-ui.xml > thunar-shortcuts-pane-ui.h
+
 thunar-standard-view-ui.h: Makefile $(srcdir)/thunar-standard-view-ui.xml
 	exo-csource --static --name=thunar_standard_view_ui $(srcdir)/thunar-standard-view-ui.xml > thunar-standard-view-ui.h
 
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 2eddbfeaad00c17253bc5b031eec98decf7ba3b4..daeb1a93f501823b5cf59440ffa4d14f5813751f 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -237,7 +237,7 @@ static void
 thunar_launcher_init (ThunarLauncher *launcher)
 {
   /* setup the action group for the launcher actions */
-  launcher->action_group = gtk_action_group_new ("thunar-launcher");
+  launcher->action_group = gtk_action_group_new ("ThunarLauncher");
   gtk_action_group_set_translation_domain (launcher->action_group, GETTEXT_PACKAGE);
   gtk_action_group_add_actions (launcher->action_group, action_entries, G_N_ELEMENTS (action_entries), launcher);
 
diff --git a/thunar/thunar-shortcuts-pane-ui.xml b/thunar/thunar-shortcuts-pane-ui.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69662aa4c0aa53b5a7cece403922243f0a5e50f0
--- /dev/null
+++ b/thunar/thunar-shortcuts-pane-ui.xml
@@ -0,0 +1,27 @@
+<ui>
+
+  <!--
+    $Id$
+
+    Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+
+    Thunar shortcuts pane user interface description file. Do NOT
+    simply edit this file if you don't know how the whole system
+    works, because it's too easy to break something.
+  -->
+
+  <menubar name="main-menu">
+    <menu action="file-menu" name="file-menu">
+      <placeholder name="placeholder-sidepane">
+        <menuitem action="shortcuts-add" name="shortcuts-add" />
+      </placeholder>
+    </menu>
+  </menubar>
+
+  <popup action="file-context-menu" name="file-context-menu">
+    <placeholder name="placeholder-sidepane">
+      <menuitem action="shortcuts-add" name="shortcuts-add" />
+    </placeholder>
+  </popup>
+
+</ui>
diff --git a/thunar/thunar-shortcuts-pane.c b/thunar/thunar-shortcuts-pane.c
index 5791ccf524e06cd802c1c99ad38d9470e20383ac..a2be073235892411fa108cc16a6c8f2619d10e91 100644
--- a/thunar/thunar-shortcuts-pane.c
+++ b/thunar/thunar-shortcuts-pane.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -21,7 +21,9 @@
 #include <config.h>
 #endif
 
+#include <thunar/thunar-shortcuts-model.h>
 #include <thunar/thunar-shortcuts-pane.h>
+#include <thunar/thunar-shortcuts-pane-ui.h>
 #include <thunar/thunar-shortcuts-view.h>
 #include <thunar/thunar-side-pane.h>
 
@@ -31,26 +33,38 @@ enum
 {
   PROP_0,
   PROP_CURRENT_DIRECTORY,
+  PROP_SELECTED_FILES,
+  PROP_UI_MANAGER,
 };
 
 
 
-static void        thunar_shortcuts_pane_class_init            (ThunarShortcutsPaneClass *klass);
-static void        thunar_shortcuts_pane_navigator_init        (ThunarNavigatorIface     *iface);
-static void        thunar_shortcuts_pane_side_pane_init        (ThunarSidePaneIface      *iface);
-static void        thunar_shortcuts_pane_init                  (ThunarShortcutsPane      *pane);
-static void        thunar_shortcuts_pane_dispose               (GObject                  *object);
-static void        thunar_shortcuts_pane_get_property          (GObject                  *object,
-                                                                guint                     prop_id,
-                                                                GValue                   *value,
-                                                                GParamSpec               *pspec);
-static void        thunar_shortcuts_pane_set_property          (GObject                  *object,
-                                                                guint                     prop_id,
-                                                                const GValue             *value,
-                                                                GParamSpec               *pspec);
-static ThunarFile *thunar_shortcuts_pane_get_current_directory (ThunarNavigator          *navigator);
-static void        thunar_shortcuts_pane_set_current_directory (ThunarNavigator          *navigator,
-                                                                ThunarFile               *current_directory);
+static void          thunar_shortcuts_pane_class_init            (ThunarShortcutsPaneClass *klass);
+static void          thunar_shortcuts_pane_component_init        (ThunarComponentIface     *iface);
+static void          thunar_shortcuts_pane_navigator_init        (ThunarNavigatorIface     *iface);
+static void          thunar_shortcuts_pane_side_pane_init        (ThunarSidePaneIface      *iface);
+static void          thunar_shortcuts_pane_init                  (ThunarShortcutsPane      *shortcuts_pane);
+static void          thunar_shortcuts_pane_dispose               (GObject                  *object);
+static void          thunar_shortcuts_pane_finalize              (GObject                  *object);
+static void          thunar_shortcuts_pane_get_property          (GObject                  *object,
+                                                                  guint                     prop_id,
+                                                                  GValue                   *value,
+                                                                  GParamSpec               *pspec);
+static void          thunar_shortcuts_pane_set_property          (GObject                  *object,
+                                                                  guint                     prop_id,
+                                                                  const GValue             *value,
+                                                                  GParamSpec               *pspec);
+static ThunarFile   *thunar_shortcuts_pane_get_current_directory (ThunarNavigator          *navigator);
+static void          thunar_shortcuts_pane_set_current_directory (ThunarNavigator          *navigator,
+                                                                  ThunarFile               *current_directory);
+static GList        *thunar_shortcuts_pane_get_selected_files    (ThunarComponent          *component);
+static void          thunar_shortcuts_pane_set_selected_files    (ThunarComponent          *component,
+                                                                  GList                    *selected_files);
+static GtkUIManager *thunar_shortcuts_pane_get_ui_manager        (ThunarComponent          *component);
+static void          thunar_shortcuts_pane_set_ui_manager        (ThunarComponent          *component,
+                                                                  GtkUIManager             *ui_manager);
+static void          thunar_shortcuts_pane_action_shortcuts_add  (GtkAction                *action,
+                                                                  ThunarShortcutsPane      *shortcuts_pane);
 
 
 
@@ -62,12 +76,24 @@ struct _ThunarShortcutsPaneClass
 struct _ThunarShortcutsPane
 {
   GtkScrolledWindow __parent__;
+
   ThunarFile       *current_directory;
+  GList            *selected_files;
+
+  GtkActionGroup   *action_group;
+  GtkUIManager     *ui_manager;
+  guint             ui_merge_id;
+
   GtkWidget        *view;
 };
 
 
 
+static const GtkActionEntry action_entries[] =
+{
+  { "shortcuts-add", NULL, N_ ("Add Folder to _Shortcuts"), NULL, N_ ("Add the selected folder to the shortcuts side pane"), G_CALLBACK (thunar_shortcuts_pane_action_shortcuts_add), },
+};
+
 static GObjectClass *thunar_shortcuts_pane_parent_class;
 
 
@@ -93,6 +119,13 @@ thunar_shortcuts_pane_get_type (void)
         NULL,
       };
 
+      static const GInterfaceInfo component_info =
+      {
+        (GInterfaceInitFunc) thunar_shortcuts_pane_component_init,
+        NULL,
+        NULL,
+      };
+
       static const GInterfaceInfo navigator_info =
       {
         (GInterfaceInitFunc) thunar_shortcuts_pane_navigator_init,
@@ -109,6 +142,7 @@ thunar_shortcuts_pane_get_type (void)
 
       type = g_type_register_static (GTK_TYPE_SCROLLED_WINDOW, I_("ThunarShortcutsPane"), &info, 0);
       g_type_add_interface_static (type, THUNAR_TYPE_NAVIGATOR, &navigator_info);
+      g_type_add_interface_static (type, THUNAR_TYPE_COMPONENT, &component_info);
       g_type_add_interface_static (type, THUNAR_TYPE_SIDE_PANE, &side_pane_info);
     }
 
@@ -127,12 +161,27 @@ thunar_shortcuts_pane_class_init (ThunarShortcutsPaneClass *klass)
 
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->dispose = thunar_shortcuts_pane_dispose;
+  gobject_class->finalize = thunar_shortcuts_pane_finalize;
   gobject_class->get_property = thunar_shortcuts_pane_get_property;
   gobject_class->set_property = thunar_shortcuts_pane_set_property;
 
-  g_object_class_override_property (gobject_class,
-                                    PROP_CURRENT_DIRECTORY,
-                                    "current-directory");
+  /* override ThunarNavigator's properties */
+  g_object_class_override_property (gobject_class, PROP_CURRENT_DIRECTORY, "current-directory");
+
+  /* override ThunarComponent's properties */
+  g_object_class_override_property (gobject_class, PROP_SELECTED_FILES, "selected-files");
+  g_object_class_override_property (gobject_class, PROP_UI_MANAGER, "ui-manager");
+}
+
+
+
+static void
+thunar_shortcuts_pane_component_init (ThunarComponentIface *iface)
+{
+  iface->get_selected_files = thunar_shortcuts_pane_get_selected_files;
+  iface->set_selected_files = thunar_shortcuts_pane_set_selected_files;
+  iface->get_ui_manager = thunar_shortcuts_pane_get_ui_manager;
+  iface->set_ui_manager = thunar_shortcuts_pane_set_ui_manager;
 }
 
 
@@ -154,25 +203,26 @@ thunar_shortcuts_pane_side_pane_init (ThunarSidePaneIface *iface)
 
 
 static void
-thunar_shortcuts_pane_init (ThunarShortcutsPane *pane)
+thunar_shortcuts_pane_init (ThunarShortcutsPane *shortcuts_pane)
 {
+  /* setup the action group for the shortcuts actions */
+  shortcuts_pane->action_group = gtk_action_group_new ("ThunarShortcutsPane");
+  gtk_action_group_set_translation_domain (shortcuts_pane->action_group, GETTEXT_PACKAGE);
+  gtk_action_group_add_actions (shortcuts_pane->action_group, action_entries, G_N_ELEMENTS (action_entries), shortcuts_pane);
+
   /* configure the GtkScrolledWindow */
-  gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (pane), NULL);
-  gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (pane), NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (pane),
-                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (shortcuts_pane), NULL);
+  gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (shortcuts_pane), NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (shortcuts_pane), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (shortcuts_pane), GTK_SHADOW_IN);
 
   /* allocate the shortcuts view */
-  pane->view = thunar_shortcuts_view_new ();
-  gtk_container_add (GTK_CONTAINER (pane), pane->view);
-  gtk_widget_show (pane->view);
+  shortcuts_pane->view = thunar_shortcuts_view_new ();
+  gtk_container_add (GTK_CONTAINER (shortcuts_pane), shortcuts_pane->view);
+  gtk_widget_show (shortcuts_pane->view);
 
   /* connect the "shortcut-activated" signal */
-  g_signal_connect_swapped (G_OBJECT (pane->view), "shortcut-activated",
-                            G_CALLBACK (thunar_navigator_change_directory), pane);
+  g_signal_connect_swapped (G_OBJECT (shortcuts_pane->view), "shortcut-activated", G_CALLBACK (thunar_navigator_change_directory), shortcuts_pane);
 }
 
 
@@ -180,9 +230,26 @@ thunar_shortcuts_pane_init (ThunarShortcutsPane *pane)
 static void
 thunar_shortcuts_pane_dispose (GObject *object)
 {
-  ThunarNavigator *navigator = THUNAR_NAVIGATOR (object);
-  thunar_navigator_set_current_directory (navigator, NULL);
-  G_OBJECT_CLASS (thunar_shortcuts_pane_parent_class)->dispose (object);
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (object);
+
+  thunar_navigator_set_current_directory (THUNAR_NAVIGATOR (shortcuts_pane), NULL);
+  thunar_component_set_selected_files (THUNAR_COMPONENT (shortcuts_pane), NULL);
+  thunar_component_set_ui_manager (THUNAR_COMPONENT (shortcuts_pane), NULL);
+
+  (*G_OBJECT_CLASS (thunar_shortcuts_pane_parent_class)->dispose) (object);
+}
+
+
+
+static void
+thunar_shortcuts_pane_finalize (GObject *object)
+{
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (object);
+
+  /* release our action group */
+  g_object_unref (G_OBJECT (shortcuts_pane->action_group));
+
+  (*G_OBJECT_CLASS (thunar_shortcuts_pane_parent_class)->finalize) (object);
 }
 
 
@@ -193,12 +260,20 @@ thunar_shortcuts_pane_get_property (GObject    *object,
                                     GValue     *value,
                                     GParamSpec *pspec)
 {
-  ThunarNavigator *navigator = THUNAR_NAVIGATOR (object);
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (object);
 
   switch (prop_id)
     {
     case PROP_CURRENT_DIRECTORY:
-      g_value_set_object (value, thunar_navigator_get_current_directory (navigator));
+      g_value_set_object (value, thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (shortcuts_pane)));
+      break;
+
+    case PROP_SELECTED_FILES:
+      g_value_set_boxed (value, thunar_component_get_selected_files (THUNAR_COMPONENT (shortcuts_pane)));
+      break;
+
+    case PROP_UI_MANAGER:
+      g_value_set_object (value, thunar_component_get_ui_manager (THUNAR_COMPONENT (shortcuts_pane)));
       break;
 
     default:
@@ -215,12 +290,20 @@ thunar_shortcuts_pane_set_property (GObject      *object,
                                     const GValue *value,
                                     GParamSpec   *pspec)
 {
-  ThunarNavigator *navigator = THUNAR_NAVIGATOR (object);
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (object);
 
   switch (prop_id)
     {
     case PROP_CURRENT_DIRECTORY:
-      thunar_navigator_set_current_directory (navigator, g_value_get_object (value));
+      thunar_navigator_set_current_directory (THUNAR_NAVIGATOR (shortcuts_pane), g_value_get_object (value));
+      break;
+
+    case PROP_SELECTED_FILES:
+      thunar_component_set_selected_files (THUNAR_COMPONENT (shortcuts_pane), g_value_get_boxed (value));
+      break;
+
+    case PROP_UI_MANAGER:
+      thunar_component_set_ui_manager (THUNAR_COMPONENT (shortcuts_pane), g_value_get_object (value));
       break;
 
     default:
@@ -234,7 +317,6 @@ thunar_shortcuts_pane_set_property (GObject      *object,
 static ThunarFile*
 thunar_shortcuts_pane_get_current_directory (ThunarNavigator *navigator)
 {
-  g_return_val_if_fail (THUNAR_IS_SHORTCUTS_PANE (navigator), NULL);
   return THUNAR_SHORTCUTS_PANE (navigator)->current_directory;
 }
 
@@ -244,27 +326,181 @@ static void
 thunar_shortcuts_pane_set_current_directory (ThunarNavigator *navigator,
                                              ThunarFile      *current_directory)
 {
-  ThunarShortcutsPane *pane = THUNAR_SHORTCUTS_PANE (navigator);
-
-  g_return_if_fail (THUNAR_IS_SHORTCUTS_PANE (pane));
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (navigator);
 
   /* disconnect from the previously set current directory */
-  if (G_LIKELY (pane->current_directory != NULL))
-    g_object_unref (G_OBJECT (pane->current_directory));
+  if (G_LIKELY (shortcuts_pane->current_directory != NULL))
+    g_object_unref (G_OBJECT (shortcuts_pane->current_directory));
 
-  pane->current_directory = current_directory;
+  /* activate the new directory */
+  shortcuts_pane->current_directory = current_directory;
 
+  /* connect to the new directory */
   if (G_LIKELY (current_directory != NULL))
     {
       /* take a reference on the new directory */
       g_object_ref (G_OBJECT (current_directory));
 
       /* select the file in the view (if possible) */
-      thunar_shortcuts_view_select_by_file (THUNAR_SHORTCUTS_VIEW (pane->view),
-                                             pane->current_directory);
+      thunar_shortcuts_view_select_by_file (THUNAR_SHORTCUTS_VIEW (shortcuts_pane->view), current_directory);
     }
 
-  g_object_notify (G_OBJECT (pane), "current-directory");
+  /* notify listeners */
+  g_object_notify (G_OBJECT (shortcuts_pane), "current-directory");
+}
+
+
+
+static GList*
+thunar_shortcuts_pane_get_selected_files (ThunarComponent *component)
+{
+  return THUNAR_SHORTCUTS_PANE (component)->selected_files;
+}
+
+
+
+static void
+thunar_shortcuts_pane_set_selected_files (ThunarComponent *component,
+                                          GList           *selected_files)
+{
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (component);
+  GtkTreeModel        *model;
+  GtkTreeIter          iter;
+  GtkAction           *action;
+  GList               *lp;
+  gint                 n;
+
+  /* disconnect from the previously selected files... */
+  thunar_file_list_free (shortcuts_pane->selected_files);
+
+  /* ...and take a copy of the newly selected files */
+  shortcuts_pane->selected_files = thunar_file_list_copy (selected_files);
+
+  /* check if the selection contains only folders */
+  for (lp = selected_files, n = 0; lp != NULL; lp = lp->next, ++n)
+    if (!thunar_file_is_directory (lp->data))
+      break;
+
+  /* change the visibility of the "shortcuts-add" action appropriately */
+  action = gtk_action_group_get_action (shortcuts_pane->action_group, "shortcuts-add");
+  if (lp == NULL && selected_files != NULL)
+    {
+      /* check if atleast one of the selected folders is not already present in the model */
+      model = gtk_tree_view_get_model (GTK_TREE_VIEW (shortcuts_pane->view));
+      if (G_LIKELY (model != NULL))
+        {
+          /* check all selected folders */
+          for (lp = selected_files; lp != NULL; lp = lp->next)
+            if (!thunar_shortcuts_model_iter_for_file (THUNAR_SHORTCUTS_MODEL (model), lp->data, &iter))
+              break;
+        }
+
+      /* display the action and change the label appropriately */
+      g_object_set (G_OBJECT (action),
+                    "label", ngettext ("Add Folder to _Shortcuts", "Add Folders to _Shortcuts", n),
+                    "sensitive", (lp != NULL),
+                    "tooltip", ngettext ("Add the selected folder to the shortcuts side pane",
+                                         "Add the selected folders to the shortcuts side pane", n),
+                    "visible", TRUE,
+                    NULL);
+    }
+  else
+    {
+      /* hide the action */
+      gtk_action_set_visible (action, FALSE);
+    }
+
+  /* notify listeners */
+  g_object_notify (G_OBJECT (shortcuts_pane), "selected-files");
+}
+
+
+
+static GtkUIManager*
+thunar_shortcuts_pane_get_ui_manager (ThunarComponent *component)
+{
+  return THUNAR_SHORTCUTS_PANE (component)->ui_manager;
+}
+
+
+
+static void
+thunar_shortcuts_pane_set_ui_manager (ThunarComponent *component,
+                                      GtkUIManager    *ui_manager)
+{
+  ThunarShortcutsPane *shortcuts_pane = THUNAR_SHORTCUTS_PANE (component);
+  GError              *error = NULL;
+
+  /* disconnect from the previous UI manager */
+  if (G_UNLIKELY (shortcuts_pane->ui_manager != NULL))
+    {
+      /* drop our action group from the previous UI manager */
+      gtk_ui_manager_remove_action_group (shortcuts_pane->ui_manager, shortcuts_pane->action_group);
+
+      /* unmerge our ui controls from the previous UI manager */
+      gtk_ui_manager_remove_ui (shortcuts_pane->ui_manager, shortcuts_pane->ui_merge_id);
+
+      /* drop our reference on the previous UI manager */
+      g_object_unref (G_OBJECT (shortcuts_pane->ui_manager));
+    }
+
+  /* activate the new UI manager */
+  shortcuts_pane->ui_manager = ui_manager;
+
+  /* connect to the new UI manager */
+  if (G_LIKELY (ui_manager != NULL))
+    {
+      /* we keep a reference on the new manager */
+      g_object_ref (G_OBJECT (ui_manager));
+
+      /* add our action group to the new manager */
+      gtk_ui_manager_insert_action_group (ui_manager, shortcuts_pane->action_group, -1);
+
+      /* merge our UI control items with the new manager */
+      shortcuts_pane->ui_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, thunar_shortcuts_pane_ui, thunar_shortcuts_pane_ui_length, &error);
+      if (G_UNLIKELY (shortcuts_pane->ui_merge_id == 0))
+        {
+          g_error ("Failed to merge ThunarShortcutsPane menus: %s", error->message);
+          g_error_free (error);
+        }
+    }
+
+  /* notify listeners */
+  g_object_notify (G_OBJECT (shortcuts_pane), "ui-manager");
+}
+
+
+
+static void
+thunar_shortcuts_pane_action_shortcuts_add (GtkAction           *action,
+                                            ThunarShortcutsPane *shortcuts_pane)
+{
+  GtkTreeModel *model;
+  GtkTreePath  *path;
+  GList        *lp;
+
+  g_return_if_fail (GTK_IS_ACTION (action));
+  g_return_if_fail (THUNAR_IS_SHORTCUTS_PANE (shortcuts_pane));
+
+  /* determine the shortcuts model for the view */
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (shortcuts_pane->view));
+  if (G_LIKELY (model != NULL))
+    {
+      /* add all selected folders to the model */
+      for (lp = shortcuts_pane->selected_files; lp != NULL; lp = lp->next)
+        if (G_LIKELY (thunar_file_is_directory (lp->data)))
+          {
+            /* append the folder to the shortcuts model */
+            path = gtk_tree_path_new_from_indices (gtk_tree_model_iter_n_children (model, NULL), -1);
+            thunar_shortcuts_model_add (THUNAR_SHORTCUTS_MODEL (model), path, lp->data);
+            gtk_tree_path_free (path);
+          }
+
+      /* update the user interface to reflect the new action state */
+      lp = thunar_file_list_copy (shortcuts_pane->selected_files);
+      thunar_component_set_selected_files (THUNAR_COMPONENT (shortcuts_pane), lp);
+      thunar_file_list_free (lp);
+    }
 }
 
 
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 991717ca3c5d4ccbd2a4f615e9c3188d9445d573..314a733c848f9a630a59f0f2d5c461c57681ccef 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -387,8 +387,8 @@ thunar_shortcuts_view_button_press_event (GtkWidget      *widget,
           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
           gtk_widget_show (item);
 
-          /* check if the volume is removable */
-          if (thunar_vfs_volume_is_removable (volume))
+          /* check if the volume is a disc */
+          if (thunar_vfs_volume_is_disc (volume))
             {
               /* append the "Eject Volume" menu action */
               item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
diff --git a/thunar/thunar-side-pane.c b/thunar/thunar-side-pane.c
index f75110b7d8529ec15b5af37c17debf37bfab1baf..c1da232dc4c4adf250cf2ee6eba6e4c7cc6f8755 100644
--- a/thunar/thunar-side-pane.c
+++ b/thunar/thunar-side-pane.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -47,7 +47,7 @@ thunar_side_pane_get_type (void)
 
       type = g_type_register_static (G_TYPE_INTERFACE, I_("ThunarSidePane"), &info, 0);
       g_type_interface_add_prerequisite (type, GTK_TYPE_WIDGET);
-      g_type_interface_add_prerequisite (type, THUNAR_TYPE_NAVIGATOR);
+      g_type_interface_add_prerequisite (type, THUNAR_TYPE_COMPONENT);
     }
 
   return type;
diff --git a/thunar/thunar-side-pane.h b/thunar/thunar-side-pane.h
index 32a6b7ca4f4630305bf62eb88faf984314b4c9cc..9d594637a94a6435ec571f71345f45a2d9685d27 100644
--- a/thunar/thunar-side-pane.h
+++ b/thunar/thunar-side-pane.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -20,7 +20,7 @@
 #ifndef __THUNAR_SIDE_PANE_H__
 #define __THUNAR_SIDE_PANE_H__
 
-#include <thunar/thunar-navigator.h>
+#include <thunar/thunar-component.h>
 
 G_BEGIN_DECLS;
 
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 1f2051484ee4e442612f298020635a2939193417..444abfb26ff95920e74b7cb19d1fef0c418ce759 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -496,7 +496,7 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (standard_view), GTK_SHADOW_IN);
 
   /* setup the action group for this view */
-  standard_view->action_group = gtk_action_group_new ("thunar-standard-view");
+  standard_view->action_group = gtk_action_group_new ("ThunarStandardView");
   gtk_action_group_set_translation_domain (standard_view->action_group, GETTEXT_PACKAGE);
   gtk_action_group_add_actions (standard_view->action_group, action_entries,
                                 G_N_ELEMENTS (action_entries),
diff --git a/thunar/thunar-throbber-fallback.h b/thunar/thunar-throbber-fallback.h
new file mode 100644
index 0000000000000000000000000000000000000000..6481258f7f504c89b5df5549a9737b8833636734
--- /dev/null
+++ b/thunar/thunar-throbber-fallback.h
@@ -0,0 +1,31 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __THUNAR_THROBBER_FALLBACK_H__
+#define __THUNAR_THROBBER_FALLBACK_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS;
+
+extern const guint8 thunar_throbber_fallback[];
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_THROBBER_FALLBACK_H__ */
diff --git a/thunar/thunar-throbber-fallback.png b/thunar/thunar-throbber-fallback.png
new file mode 100644
index 0000000000000000000000000000000000000000..a952cbc677197b25e434e91e33ca2d2614422c13
Binary files /dev/null and b/thunar/thunar-throbber-fallback.png differ
diff --git a/thunar/thunar-throbber.c b/thunar/thunar-throbber.c
index d2523f2524b23d7a8d27e20d24e1df2d712aeb5c..1b61a41e62b370d729638cec1c6dbc1d791dcd29 100644
--- a/thunar/thunar-throbber.c
+++ b/thunar/thunar-throbber.c
@@ -21,18 +21,10 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
-
 #include <exo/exo.h>
 
 #include <thunar/thunar-throbber.h>
-
-#if !GTK_CHECK_VERSION(2,7,1) && defined(GDK_WINDOWING_X11) && defined(HAVE_CAIRO)
-#include <cairo/cairo-xlib.h>
-#include <gdk/gdkx.h>
-#endif
+#include <thunar/thunar-throbber-fallback.h>
 
 
 
@@ -56,6 +48,8 @@ static void     thunar_throbber_set_property  (GObject              *object,
                                                guint                 prop_id,
                                                const GValue         *value,
                                                GParamSpec           *pspec);
+static void     thunar_throbber_realize       (GtkWidget            *widget);
+static void     thunar_throbber_unrealize     (GtkWidget            *widget);
 static void     thunar_throbber_size_request  (GtkWidget            *widget,
                                                GtkRequisition       *requisition);
 static gboolean thunar_throbber_expose_event  (GtkWidget            *widget,
@@ -74,9 +68,11 @@ struct _ThunarThrobber
 {
   GtkWidget __parent__;
 
-  gboolean animated;
-  gint     angle;
-  gint     timer_id;
+  GdkPixbuf *icon;
+
+  gboolean   animated;
+  gint       index;
+  gint       timer_id;
 };
 
 
@@ -119,6 +115,7 @@ thunar_throbber_class_init (ThunarThrobberClass *klass)
 {
   GtkWidgetClass *gtkwidget_class;
   GObjectClass   *gobject_class;
+  GdkPixbuf      *icon;
 
   /* determine the parent type class */
   thunar_throbber_parent_class = g_type_class_peek_parent (klass);
@@ -129,6 +126,8 @@ thunar_throbber_class_init (ThunarThrobberClass *klass)
   gobject_class->set_property = thunar_throbber_set_property;
 
   gtkwidget_class = GTK_WIDGET_CLASS (klass);
+  gtkwidget_class->realize = thunar_throbber_realize;
+  gtkwidget_class->unrealize = thunar_throbber_unrealize;
   gtkwidget_class->size_request = thunar_throbber_size_request;
   gtkwidget_class->expose_event = thunar_throbber_expose_event;
 
@@ -144,6 +143,11 @@ thunar_throbber_class_init (ThunarThrobberClass *klass)
                                                          "animated",
                                                          FALSE,
                                                          EXO_PARAM_READWRITE));
+
+  /* register the "process-working" fallback icon */
+  icon = gdk_pixbuf_new_from_inline (-1, thunar_throbber_fallback, FALSE, NULL);
+  gtk_icon_theme_add_builtin_icon ("process-working", 22, icon);
+  g_object_unref (G_OBJECT (icon));
 }
 
 
@@ -216,47 +220,48 @@ thunar_throbber_set_property (GObject      *object,
 
 
 static void
-thunar_throbber_size_request (GtkWidget      *widget,
-                              GtkRequisition *requisition)
+thunar_throbber_realize (GtkWidget *widget)
 {
-  gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &requisition->width, &requisition->height);
-  requisition->width += 2;
-  requisition->height += 2;
-}
+  ThunarThrobber *throbber = THUNAR_THROBBER (widget);
+  GtkIconTheme   *icon_theme;
 
+  /* let Gtk+ realize the widget */
+  (*GTK_WIDGET_CLASS (thunar_throbber_parent_class)->realize) (widget);
 
+  /* determine the icon theme for our screen */
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
 
-#if GTK_CHECK_VERSION(2,7,1)
-static cairo_t*
-get_cairo_context (GdkWindow *window)
-{
-  return gdk_cairo_create (window);
+  /* try to lookup the "process-working" icon */
+  throbber->icon = gtk_icon_theme_load_icon (icon_theme, "process-working", 22, GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_NO_SVG, NULL);
 }
-#elif defined(GDK_WINDOWING_X11) && defined(HAVE_CAIRO)
-static cairo_t*
-get_cairo_context (GdkWindow *window)
+
+
+
+static void
+thunar_throbber_unrealize (GtkWidget *widget)
 {
-  cairo_surface_t *surface;
-  GdkDrawable     *drawable;
-  cairo_t         *cr;
-  gint             w;
-  gint             h;
-  gint             x;
-  gint             y;
+  ThunarThrobber *throbber = THUNAR_THROBBER (widget);
 
-  gdk_window_get_internal_paint_info (window, &drawable, &x, &y);
-  gdk_drawable_get_size (drawable, &w, &h);
+  /* release the icon if any */
+  if (G_LIKELY (throbber->icon != NULL))
+    {
+      g_object_unref (G_OBJECT (throbber->icon));
+      throbber->icon = NULL;
+    }
+
+  /* let Gtk+ unrealize the widget */
+  (*GTK_WIDGET_CLASS (thunar_throbber_parent_class)->unrealize) (widget);
+}
 
-  surface = cairo_xlib_surface_create (GDK_DRAWABLE_XDISPLAY (drawable), GDK_DRAWABLE_XID (drawable),
-                                       gdk_x11_visual_get_xvisual (gdk_drawable_get_visual (drawable)), w, h);
-  cr = cairo_create (surface);
-  cairo_surface_destroy (surface);
 
-  cairo_translate (cr, -x, -y);
 
-  return cr;
+static void
+thunar_throbber_size_request (GtkWidget      *widget,
+                              GtkRequisition *requisition)
+{
+  requisition->width = 22;
+  requisition->height = 22;
 }
-#endif
 
 
 
@@ -264,52 +269,41 @@ static gboolean
 thunar_throbber_expose_event (GtkWidget      *widget,
                               GdkEventExpose *event)
 {
-#if GTK_CHECK_VERSION(2,7,1) || (defined(GDK_WINDOWING_X11) && defined(HAVE_CAIRO))
   ThunarThrobber *throbber = THUNAR_THROBBER (widget);
-  GdkColor        color;
-  cairo_t        *cr;
-  gdouble         a, n;
-  gint            size;
-  gint            x, y;
-
-  /* determine the foreground color */
-  color = widget->style->fg[GTK_STATE_NORMAL];
-
-  /* allocate a cairo context */
-  cr = get_cairo_context (widget->window);
-
-  /* setup clipping area */
-#if GTK_CHECK_VERSION(2,7,1)
-  gdk_cairo_region (cr, event->region);
-  cairo_clip (cr);
-#endif
-
-  /* determine size and position of the throbber */
-  size = MIN (widget->allocation.width, widget->allocation.height);
-  x = widget->allocation.x + (widget->allocation.width - size) / 2;
-  y = widget->allocation.y + (widget->allocation.height - size) / 2;
-
-  /* apply required transformations */
-  cairo_translate (cr, x, y);
-  cairo_scale (cr, size, size);
-  cairo_translate (cr, 0.5, 0.5);
-  cairo_rotate (cr, (throbber->angle * M_PI) / 180.0);
-
-  /* draw the circles */
-  for (n = 0.0; n < 2.0; n += 0.25)
+  gint            icon_index;
+  gint            icon_cols;
+  gint            icon_rows;
+  gint            icon_x;
+  gint            icon_y;
+
+  /* verify that we have a valid icon */
+  if (G_LIKELY (throbber->icon != NULL))
     {
-      /* determine the alpha based on whether the timer is still active */
-      a = (throbber->timer_id >= 0) ? (n + 0.5) / 3.0 : 0.30;
-
-      /* render the circle */
-      cairo_set_source_rgba (cr, color.red / 65535.0, color.green / 65535.0, color.blue / 65535.0, a);
-      cairo_arc (cr, cos (n * M_PI) / 3.0, sin (n * M_PI) /3.0, 0.105, 0.0, 2.0 * M_PI);
-      cairo_fill (cr);
+      /* determine the icon columns and icon rows */
+      icon_cols = gdk_pixbuf_get_width (throbber->icon) / 22;
+      icon_rows = gdk_pixbuf_get_height (throbber->icon) / 22;
+
+      /* verify that the icon is usable */
+      if (G_LIKELY (icon_cols > 0 && icon_rows > 0))
+        {
+          /* determine the icon index */
+          icon_index = throbber->index % (icon_cols * icon_rows);
+
+          /* make sure, we don't display the "empty state" while animated */
+          if (G_LIKELY (throbber->timer_id >= 0))
+            icon_index = MAX (icon_index, 1);
+
+          /* determine the icon x/y offset for the icon index */
+          icon_x = (icon_index % icon_cols) * 22;
+          icon_y = (icon_index / icon_cols) * 22;
+
+          /* render the given part of the icon */
+          gdk_draw_pixbuf (event->window, NULL, throbber->icon, icon_x, icon_y,
+                           widget->allocation.x, widget->allocation.y,
+                           22, 22, GDK_RGB_DITHER_NONE, 0, 0);
+        }
     }
 
-  cairo_destroy (cr);
-#endif
-
   return TRUE;
 }
 
@@ -321,7 +315,7 @@ thunar_throbber_timer (gpointer user_data)
   ThunarThrobber *throbber = THUNAR_THROBBER (user_data);
 
   GDK_THREADS_ENTER ();
-  throbber->angle = (throbber->angle + 45) % 360;
+  throbber->index += 1;
   gtk_widget_queue_draw (GTK_WIDGET (throbber));
   GDK_THREADS_LEAVE ();
 
@@ -333,6 +327,7 @@ thunar_throbber_timer (gpointer user_data)
 static void
 thunar_throbber_timer_destroy (gpointer user_data)
 {
+  THUNAR_THROBBER (user_data)->index = 0;
   THUNAR_THROBBER (user_data)->timer_id = -1;
 }
 
@@ -394,7 +389,7 @@ thunar_throbber_set_animated (ThunarThrobber *throbber,
   if (animated && (throbber->timer_id < 0))
     {
       /* start the animation */
-      throbber->timer_id = g_timeout_add_full (G_PRIORITY_LOW, 60, thunar_throbber_timer,
+      throbber->timer_id = g_timeout_add_full (G_PRIORITY_LOW, 25, thunar_throbber_timer,
                                                throbber, thunar_throbber_timer_destroy);
     }
 
diff --git a/thunar/thunar-window-ui.xml b/thunar/thunar-window-ui.xml
index f796d8742ccd13152f6da65296d5969cddc60ad7..df856e59ffa8044b57e4fa839063359a2391ce2e 100644
--- a/thunar/thunar-window-ui.xml
+++ b/thunar/thunar-window-ui.xml
@@ -17,6 +17,8 @@
       <separator />
       <placeholder name="placeholder-launcher" />
       <separator />
+      <placeholder name="placeholder-sidepane" />
+      <separator />
       <placeholder name="placeholder-file-properties" />
       <separator />
       <menuitem action="close-all-windows" name="close-all-windows" />
@@ -78,6 +80,8 @@
   <popup action="file-context-menu" name="file-context-menu">
     <placeholder name="placeholder-launcher" />
     <separator />
+    <placeholder name="placeholder-sidepane" />
+    <separator />
     <placeholder name="placeholder-clipboard-actions" />
     <separator />
     <placeholder name="placeholder-edit-actions" />
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 69b818c2447cdd301f818d087c6492efc7495b12..a96881332ec349a3abc2ee2112585d6f49d1604e 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -185,6 +185,7 @@ struct _ThunarWindow
   GtkWidget              *table;
   GtkWidget              *throbber;
   GtkWidget              *paned;
+  GtkWidget              *sidepane;
   GtkWidget              *view_container;
   GtkWidget              *view;
   GtkWidget              *statusbar;
@@ -453,7 +454,7 @@ thunar_window_init (ThunarWindow *window)
   window->icon_factory = thunar_icon_factory_get_default ();
 
   /* setup the action group for this window */
-  window->action_group = gtk_action_group_new ("thunar-window");
+  window->action_group = gtk_action_group_new ("ThunarWindow");
   gtk_action_group_set_translation_domain (window->action_group, GETTEXT_PACKAGE);
   gtk_action_group_add_actions (window->action_group, action_entries, G_N_ELEMENTS (action_entries), GTK_WIDGET (window));
   gtk_action_group_add_toggle_actions (window->action_group, toggle_action_entries, G_N_ELEMENTS (toggle_action_entries), GTK_WIDGET (window));
@@ -1101,23 +1102,30 @@ thunar_window_action_side_pane_changed (GtkRadioAction *action,
                                         GtkRadioAction *current,
                                         ThunarWindow   *window)
 {
-  GtkWidget *widget;
-  GType      type;
+  GType type;
 
   /* drop the previous side pane (if any) */
-  widget = gtk_paned_get_child1 (GTK_PANED (window->paned));
-  if (G_LIKELY (widget != NULL))
-    gtk_widget_destroy (widget);
+  if (G_UNLIKELY (window->sidepane != NULL))
+    {
+      gtk_widget_destroy (window->sidepane);
+      window->sidepane = NULL;
+    }
 
   /* determine the new type of side pane */
   type = gtk_radio_action_get_current_value (action);
   if (G_LIKELY (type != G_TYPE_NONE))
     {
-      widget = g_object_new (type, NULL);
-      exo_binding_new (G_OBJECT (window), "current-directory", G_OBJECT (widget), "current-directory");
-      g_signal_connect_swapped (G_OBJECT (widget), "change-directory", G_CALLBACK (thunar_window_set_current_directory), window);
-      gtk_paned_pack1 (GTK_PANED (window->paned), widget, FALSE, FALSE);
-      gtk_widget_show (widget);
+      /* allocate the new side pane widget */
+      window->sidepane = g_object_new (type, NULL);
+      thunar_component_set_ui_manager (THUNAR_COMPONENT (window->sidepane), window->ui_manager);
+      exo_binding_new (G_OBJECT (window), "current-directory", G_OBJECT (window->sidepane), "current-directory");
+      g_signal_connect_swapped (G_OBJECT (window->sidepane), "change-directory", G_CALLBACK (thunar_window_set_current_directory), window);
+      gtk_paned_pack1 (GTK_PANED (window->paned), window->sidepane, FALSE, FALSE);
+      gtk_widget_show (window->sidepane);
+
+      /* connect the side pane widget to the view (if any) */
+      if (G_LIKELY (window->view != NULL))
+        exo_binding_new (G_OBJECT (window->view), "selected-files", G_OBJECT (window->sidepane), "selected-files");
     }
 
   /* remember the setting */
@@ -1243,6 +1251,10 @@ thunar_window_action_view_changed (GtkRadioAction *action,
       gtk_widget_grab_focus (window->view);
       gtk_widget_show (window->view);
 
+      /* connect to the sidepane (if any) */
+      if (G_LIKELY (window->sidepane != NULL))
+        exo_binding_new (G_OBJECT (window->view), "selected-files", G_OBJECT (window->sidepane), "selected-files");
+
       /* connect to the statusbar (if any) */
       if (G_LIKELY (window->statusbar != NULL))
         exo_binding_new (G_OBJECT (window->view), "statusbar-text", G_OBJECT (window->statusbar), "text");