diff --git a/ChangeLog b/ChangeLog
index 5b312d1a812f53932571118ac228e8725a05401e..2b81620baaf4ec72ca7918e038da5f5cbb8cf46a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2006-01-28	Benedikt Meurer <benny@xfce.org>
+
+	* thunar-vfs/thunar-vfs-chmod-job.c(thunar_vfs_chmod_job_execute),
+	  thunar-vfs/thunar-vfs-chown-job.c(thunar_vfs_chown_job_execute):
+	  Properly emit and release an error that occurred on the last file.
+	* THANKS, thunar/thunar-shortcuts-view.c: Add support to open shortcuts
+	  in new windows using the context menu or double-middle-clicks, based
+	  on a patch by Laurent Meunier <meunier.laurent@laposte.net>. This
+	  fixes bug #1381.
+	* docs/README.thunarrc, thunar/thunar-preferences.c,
+	  thunar/thunar-window.c: Remember the window dimensions whenever the
+	  size of a window is changed and use the last saved window dimensions
+	  for newly created windows. This fixes bug #1389.
+	* thunar/thunar-pango-extensions.{c,h}: Add new helper function
+	  thunar_pango_attr_list_big_bold(), which returns a pango attribute
+	  list for big, bold text rendering.
+	* thunar/thunar-permissions-chooser.c
+	  (thunar_permissions_chooser_ask_recursive): Use big, bold label for
+	  the dialog title to stay consistent with GtkMessageDialog.
+	* thunar-vfs/Makefile.am, thunar-vfs/thunar-vfs-creat-job.{c,h},
+	  thunar-vfs/thunar-vfs.{c,h}, thunar-vfs/thunar-vfs.symbols: Add new
+	  class ThunarVfsCreatJob, which is used to create empty files for a
+	  given list of paths.
+	* docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml,
+	  docs/reference/thunar-vfs/thunar-vfs-sections.txt: Update API docs.
+	* thunar/thunar-application.{c,h}: Add thunar_application_creat() as
+	  wrapper for the newly imported ThunarVfsCreatJob.
+	* thunar/thunar-application.{c,h}: Add thunar_application_copy_to() to
+	  copy files from one location to another, rather than copying files
+	  from different sources to exactly one folder.
+	* thunar/thunar-create-dialog.c(thunar_create_dialog_set_filename):
+	  If the suggested file name contains a dot, pre-select only the text
+	  up to the dot.
+	* thunar/thunar-standard-view-ui.xml, thunar/thunar-standard-view.c,
+	  thunar/thunar-templates-action.{c,h}, thunar/Makefile.am: Add support
+	  for Templates in a way compatible with what Nautilus does currently.
+	  This is part one of the fix for bug #1391.
+	* thunar/thunar-preferences, docs/README.thunarrc: Add new property
+	  "misc-show-about-templates", which determines whether the "About
+	  Templates" dialog will be shown when entering the Templates folder.
+	* icons/16x16/stock_thunar-templates.png, icons/16x16/Makefile.am,
+	  thunar/thunar-stock.{c,h}: Add new stock icon "thunar-templates".
+	* thunar/thunar-window-ui.xml, thunar/thunar-window.c: Add "Templates"
+	  to the "Go" menu, which will open the ~/Templates folder (it will be
+	  created on-demand) and popup a message describing the purpose of the
+	  ~/Templates folder. This is part two of the fix for bug #1391.
+	* po/POTFILES.in: Add new files here.
+	* po/*.po: Merge new strings.
+
 2006-01-25	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-info.c, thunar-vfs/thunar-vfs-xfer.c: Apply
diff --git a/THANKS b/THANKS
index cfec3b317c0cd00a7c36a205db9128bbee1a48ee..bc126906294a5cc8ed23296dae10955a652a9a49 100644
--- a/THANKS
+++ b/THANKS
@@ -53,6 +53,9 @@ Other contributors (sorted by name):
  Daichi Kawahata <daichi@xfce.org>
   * i18n coordinator
 
+ Laurent Meunier <meunier.laurent@laposte.net>
+  * patches
+
  Danny Milosavljevic <danny.milo@gmx.net>
   * patches
 
diff --git a/docs/README.thunarrc b/docs/README.thunarrc
index a5445a8ab0710ed23a671c057c22b327af8f0b78..23a91527c8e79dc1544bf44795ace71a841f682c 100644
--- a/docs/README.thunarrc
+++ b/docs/README.thunarrc
@@ -34,6 +34,16 @@ The Thunar Configuration File (thunarrc)
      The name of the widget class which should be used for the main view
      component in Thunar windows if the DefaultView preference is "void".
 
+   * LastWindowHeight (1..4096)
+
+     The last known height of a Thunar window, which will be used as
+     default height for newly created windows.
+
+   * LastWindowWidth (1..4096)
+
+     The last known width of a Thunar window, which will be used as
+     default width for newly created windows.
+
    * MiscFoldersFirst (FALSE/TRUE)
      
      Determines whether folder should be sorted before files.
@@ -51,6 +61,15 @@ The Thunar Configuration File (thunarrc)
      Determines whether to apply permissions recursively everytime the
      permissions are altered by the user.
 
+   * MiscShowAboutTemplates (FALSE/TRUE)
+
+     Whether to display the "About Templates" dialog, when opening the
+     Templates folder from the Go menu.
+
+   * MiscShowThumbnails (FALSE/TRUE)
+
+     Whether to generate and display thumbnails for previewable files.
+
    * MiscTextBesidesIcons (FALSE/TRUE)
 
      Controls whether the icon view should display the file names beside
diff --git a/docs/reference/thunar-vfs/thunar-vfs-sections.txt b/docs/reference/thunar-vfs/thunar-vfs-sections.txt
index 9aa8282d5225bc8d087bf82789d3ba7a259e818b..0061410a2c3188d7589a0cc34ef49665318e69a9 100644
--- a/docs/reference/thunar-vfs/thunar-vfs-sections.txt
+++ b/docs/reference/thunar-vfs/thunar-vfs-sections.txt
@@ -209,6 +209,8 @@ thunar_vfs_monitor_get_type
 <FILE>thunar-vfs-operations</FILE>
 <TITLE>Operations</TITLE>
 thunar_vfs_listdir
+thunar_vfs_create_file
+thunar_vfs_create_files
 thunar_vfs_copy_file
 thunar_vfs_copy_files
 thunar_vfs_link_file
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml
index 50ece7f87bcf9bc9a77060c57ab07882e8c81424..ed2c59d41c0e77ddcb41cb53559f7e83f45cbf27 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml
@@ -29,6 +29,26 @@ Operations
 @uri: 
 
 
+<!-- ##### FUNCTION thunar_vfs_create_file ##### -->
+<para>
+
+</para>
+
+@path: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION thunar_vfs_create_files ##### -->
+<para>
+
+</para>
+
+@path_list: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION thunar_vfs_copy_file ##### -->
 <para>
 
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 4680093fca3bfbb8ee384595b170a95851fb57b2..9936dc01007d7164126a93df35c7b3c4de50cb89 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -3,6 +3,7 @@
 iconsdir = $(datadir)/icons/hicolor/16x16/stock/generic
 icons_DATA =								\
 	stock_thunar-group.png						\
+	stock_thunar-templates.png					\
 	stock_thunar-user.png
 
 EXTRA_DIST =								\
diff --git a/icons/16x16/stock_thunar-templates.png b/icons/16x16/stock_thunar-templates.png
new file mode 100644
index 0000000000000000000000000000000000000000..92ae99a24c239ffcbdb8ba52a55488e00824e092
Binary files /dev/null and b/icons/16x16/stock_thunar-templates.png differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 664761b291761ad547ae5dc7384d89a38542937c..8fe61ce3cf0b4159fb858500642761de39ed7e31 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 thunar-vfs/thunar-vfs-chmod-job.c
 thunar-vfs/thunar-vfs-chown-job.c
+thunar-vfs/thunar-vfs-creat-job.c
 thunar-vfs/thunar-vfs-config.c
 thunar-vfs/thunar-vfs-exec.c
 thunar-vfs/thunar-vfs-info.c
@@ -71,6 +72,7 @@ thunar/thunar-side-pane.c
 thunar/thunar-standard-view.c
 thunar/thunar-statusbar.c
 thunar/thunar-stock.c
+thunar/thunar-templates-action.c
 thunar/thunar-text-renderer.c
 thunar/thunar-thumbnail-generator.c
 thunar/thunar-view.c
diff --git a/po/ca.po b/po/ca.po
index 0269a3dc2582ee96e8cfe5f875abd059c68d3747..7f904cb8c05a8b62be9603def31c410db342783b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+0100\n"
 "PO-Revision-Date: 2006-01-20 12:19+0100\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -42,44 +42,46 @@ msgstr ""
 "\n"
 "Voleu ometre-ho?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "No s'ha pogut determinar la informació de `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "No s'han pogut canviar els permisos de `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "No s'ha pogut canviar el propietari de `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "No s'ha pogut canviar el grup de `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "No s'ha especificat camp Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "No s'ha pogut analitzar el fitxer"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "El nom del fitxer no és vàlid"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "El nom de l'escriptori no és vàlid"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "No s'ha pogut saber l'estat del fitxer `%s': %s"
@@ -231,73 +233,74 @@ msgstr[1] "%ua enllaç a %s"
 msgid "Failed to create directory `%s'"
 msgstr "No s'ha pogut crear el directori `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "No s'ha pogut crear un fifo anomenat `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "No s'ha pogut obrir `%s' per lectura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "No s'ha pogut obrir `%s' per escriptura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr "No s'ha pogut llegir des de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr "No s'ha pogut escriure a `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "No s'ha pogut suprimir `%s'"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "S'ha cancel·lat l'operació"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "No s'ha pogut llegir l'enllaç des de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "No s'ha pogut crear l'enllaç simbòlic `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "No s'ha pogut canviar el mode de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "No s'ha pogut determinar l'informació de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "No s'ha pogut copiar el fitxer especial `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "No s'ha pogut crear un `%s' simbòlic"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -306,23 +309,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "No s'ha pogut executar l'operació"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "S'estan copiant els fitxers..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "S'estan creant els enllaços simbòlics..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "S'estan movent els fitxers..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "S'estan suprimint els fitxers..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Recol·lectant fitxers..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "S'estan creant els directoris..."
 
@@ -432,10 +440,16 @@ msgstr "Altres aplicacions:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "El portaretalls no té res per enganxar"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "Introduïu el nom nou:"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, fuzzy, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr "converteix"
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Nom"
@@ -593,8 +607,9 @@ msgid "Icon view"
 msgstr "Icona"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Obre"
 
@@ -604,7 +619,8 @@ msgid "Open the selected items"
 msgstr "Obre seleccionat elements"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Obre-ho en una nova finestra"
 
@@ -706,7 +722,7 @@ msgstr "Obre la ubicació"
 msgid "_Location:"
 msgstr "_Ubicació:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Ha fallat"
@@ -1073,201 +1089,218 @@ msgstr "Octets"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Ha fallat"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 #, fuzzy
 msgid "_Remove Shortcut"
 msgstr "Suprimeix Drecera"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 #, fuzzy
 msgid "Re_name Shortcut"
 msgstr "Drecera"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, fuzzy, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "no a"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 #, fuzzy
 msgid "Failed to add new shortcut"
 msgstr "Ha fallat afegeix nou drecera"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Fitxer Context Menú"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Carpeta Context Menú"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea Carpeta."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Create an empty folder within the current folder"
 msgstr "Crea"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Visualització propietats de seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 #, fuzzy
 msgid "_Copy Files"
 msgstr "Copia Fitxers"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Copia seleccionat"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Fitxers"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Retalla seleccionat"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Enganxa Fitxers"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Suprimeix Fitxers"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Suprimeix seleccionat"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Enganxa Fitxers Carpeta"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Paste files into the selected folder"
 msgstr "Enganxa seleccionat"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Selecciona tot Fitxers"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Select all files in this window"
 msgstr "Selecciona tot in finestra"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Selecciona Patró."
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona tot a"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 #, fuzzy
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Fitxer"
 msgstr[1] "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Duplicat seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea un _enllaç"
 msgstr[1] "Crea un _enllaç"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Create a symbolic link for each selected file"
 msgstr "Crea a enllaç per seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Reanomena"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Canvia el nom seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "Crea Acció"
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "S'estan carregant els continguts de la carpeta..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Nou Carpeta."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder"
 msgstr "Nova carpeta"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder..."
 msgstr "Nou Carpeta."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
-#, fuzzy, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
-msgstr "converteix"
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "suprimeix?"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1278,40 +1311,40 @@ msgid_plural ""
 msgstr[0] "seleccionat fitxer?"
 msgstr[1] "seleccionat fitxer?"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 #, fuzzy
 msgid "If you delete a file, it is permanently lost."
 msgstr "Si suprimeix a fitxer és."
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Selecciona Patró"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Patró:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Ha fallat obre"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Copia Fitxer"
 msgstr[1] "Copia Fitxer"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Fitxer"
 msgstr[1] "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1337,111 +1370,120 @@ msgstr "text"
 msgid "The main text to be displayed in the statusbar"
 msgstr "text in barra d'estat"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Fitxers"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Obre una nova _finestra"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 #, fuzzy
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Obre a nou finestra per"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "Ta_nca totes les finestres"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 #, fuzzy
 msgid "Close all Thunar windows"
 msgstr "Tanca tot finestres"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Tanca aquesta finestra"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr "Pr_efercències"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Edita preferències Thunar"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Ubicació"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "Barres lateral_s"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Vés"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "Obre el _pare"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Obre la carpeta pare"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
 msgid "_Home"
 msgstr "_Inici"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
-msgid "Open the home folder"
+msgid "Go to the home folder"
 msgstr "Obre inici"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Vés a la carpeta visitada posteriorment"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "Obre una _ubicació..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Indiqueu una ubicació a obrir"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 #, fuzzy
 msgid "Display information about Thunar"
 msgstr "Pantalla quant a"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostra els fitxers _ocults"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 #, fuzzy
 msgid "Toggles the display of hidden files in the current window"
 msgstr "de in finestra"
@@ -1449,83 +1491,112 @@ msgstr "de in finestra"
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 #, fuzzy
 msgid "_Shortcuts"
 msgstr "Dreceres"
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "Amagad_a"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Estil"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 #, fuzzy
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "amb"
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Estil"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 #, fuzzy
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Tradicional amb i"
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr "No mostris cap selector d'ubicació"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Visualitza com a _icones"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 #, fuzzy
 msgid "Display folder content in an icon view"
 msgstr "Pantalla in icona"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 #, fuzzy
 msgid "View as _Detailed List"
 msgstr "Visualització Llista"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 #, fuzzy
 msgid "Display folder content in a detailed list view"
 msgstr "Pantalla in a llista"
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Ha fallat obre pare"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Ha fallat obre inici"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+#, fuzzy
+msgid "Do _not display this message again"
+msgstr "no"
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Ha fallat obre pare"
+
+#: ../thunar/thunar-window.c:1209
 #, 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:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr ""
 "Softcatalà <tradgnome@softcatala.org>\n"
diff --git a/po/de.po b/po/de.po
index 5f37915444d1fe434355465751c3515bf70eb5b1..0a09951b5e4fa6aadf35a75a47fa5889124710e9 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+0100\n"
 "PO-Revision-Date: 2006-01-23 23:26+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -35,44 +35,46 @@ msgid ""
 "Do you want to skip it?"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Andere Anwendung..."
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Andere Anwendung..."
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Andere Anwendung..."
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Andere Anwendung..."
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr ""
@@ -218,73 +220,74 @@ msgstr[1] ""
 msgid "Failed to create directory `%s'"
 msgstr "Konnte Verzeichnis `%s' nicht erstellen"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "Konnte `%s' nicht zum Lesen öffnen"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "Konnte `%s' nicht zum Schreiben öffnen"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "Konnte `%s' nicht löschen"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "Operation abgebrochen"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr ""
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -293,23 +296,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr ""
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Kopiere Dateien..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "Erstelle Verknüpfungen..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Verschiebe Dateien..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Lösche Dateien..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Lösche Dateien..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "Erstelle Verzeichnisse..."
 
@@ -419,10 +427,16 @@ msgstr "Andere Anwendungen:"
 msgid "There is nothing on the clipboard to paste"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "Neuen Namen eingeben:"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr ""
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Name"
@@ -570,8 +584,9 @@ msgid "Icon view"
 msgstr ""
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "Ö_ffnen"
 
@@ -580,7 +595,8 @@ msgid "Open the selected items"
 msgstr ""
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr ""
 
@@ -678,7 +694,7 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Andere Anwendung..."
@@ -1003,173 +1019,190 @@ msgstr "%s (%u Byte)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Konnte `%s' nicht umbenennen"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 msgid "_Remove Shortcut"
 msgstr "Lesezeichen _enfernen"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 msgid "Re_name Shortcut"
 msgstr "Lesezeichen _umbenennen"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr "Embleme _anzeigen"
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr ""
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 #, fuzzy
 msgid "Failed to add new shortcut"
 msgstr "Andere Anwendung..."
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr "_Verzeichnis erstellen..."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "Dateien _kopieren"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "Dateien _ausschneiden"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 msgid "_Paste Files"
 msgstr "Dateien e_infügen"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "_Delete Files"
 msgstr "Dateien _löschen"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "Alles au_swählen"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select _by Pattern..."
 msgstr "_Muster auswählen..."
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Umbennen"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "Neue Aktion erstellen"
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Neues Verzeichnis..."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder..."
 msgstr "Neues Verzeichnis..."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
+msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1180,38 +1213,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "Muster auswählen"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Muster:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Konnte Verzeichnis `%s' nicht öffnen"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Datei"
 msgstr[1] "_Datei"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Datei"
 msgstr[1] "_Datei"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] ""
@@ -1233,176 +1266,212 @@ msgstr ""
 msgid "The main text to be displayed in the statusbar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Datei"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "_Neues Fenster öffnen"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "_Alle Fenster schließen"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Alle Thunar Fenster schließen"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Schließen"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr "_Einstellungen..."
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Edit Thunars Preferences"
 msgstr "Thunars Einstellungen bearbeiten"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Anzeige"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Gehe"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr ""
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 msgid "_Home"
 msgstr ""
 
-#: ../thunar/thunar-window.c:177
-msgid "Open the home folder"
+#: ../thunar/thunar-window.c:188
+msgid "Go to the home folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+msgid "Go to the templates folder"
+msgstr ""
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "_Ort öffnen..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr ""
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "Ü_ber"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Show _Hidden Files"
 msgstr "_Verborgene Dateien anzeigen"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Verborgene Dateien im momentan geöffneten Fenster anzeigen/verbergen"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr ""
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Detailierte Verzeichnisansicht"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 msgid "Failed to open home directory"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Detailierte Verzeichnisansicht"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "Benedikt Meurer <benny@xfce.org>"
 
diff --git a/po/el.po b/po/el.po
index d59b8fc6a75ce0f8306bdd3df41204983fd8bcd2..3da0c134ed9ecaf7dbf43891b8f86351d0b37c4b 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+0100\n"
 "PO-Revision-Date: 2005-12-04 23:18+0900\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -41,44 +41,46 @@ msgstr ""
 "\n"
 "Θέλετε να το προσπεράσετε;"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Ο προσδιορισμός των πληροφοριών αρχείου για το `%s' απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Η προσθήκη της εφαρμογής `%s' απέτυχε."
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Η προσθήκη της εφαρμογής `%s' απέτυχε."
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Η προσθήκη της εφαρμογής `%s' απέτυχε."
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "Δεν έχει οριστεί το πεδίο Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "Δεν ήταν δυνατή η ανάγνωση του αρχείου"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "Μη έγκυρο αρχείο συντόμευσης"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr ""
@@ -231,73 +233,74 @@ msgstr[1] "%uος δεσμός προς το %s"
 msgid "Failed to create directory `%s'"
 msgstr "Η δημιουργία του καταλόγου `%s' απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "Το άνοιγμα του `%s' για ανάγνωση απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "Το άνοιγμα του `%s' για εγγραφή απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "Η διαγραφή του `%s' απέτυχε"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "Η ενέργεια ακυρώθηκε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Η ανάγνωση του συμβολικού δεσμού `%s' απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Η δημιουργία συμβολικού δεσμού `%s' απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Ο προσδιορισμός των πληροφοριών αρχείου για το `%s' απέτυχε"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Αδυναμία αντιγραφής του ειδικού αρχείου `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Δεν είναι δυνατή η δημιουργία συμβολικού δεσμού `%s'"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -306,23 +309,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "Η εκκίνηση της ενέργειας απέτυχε"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Αντιγραφή αρχείων..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "Δημιουργία συμβολικών δεσμών..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Μετακίνηση αρχείων..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Διαγραφή αρχείων..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Συλλογή αρχείων..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "Δημιουργία καταλόγων..."
 
@@ -432,10 +440,18 @@ msgstr "Άλλες Εφαρμογές:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Δεν υπάρχει τίποτα στο πρόχειρο για να επικολληθεί."
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "Εισάγετε νέο όνομα:"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr ""
+"Δεν είναι δυνατή η μετατροπή του ονόματος αρχείου `%s' στην τοπική "
+"κωδικοποίηση"
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Όνομα"
@@ -583,8 +599,9 @@ msgid "Icon view"
 msgstr "Εικονίδια"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
@@ -593,7 +610,8 @@ msgid "Open the selected items"
 msgstr "Εκτέλεση των επιλεγμένων αντικειμένων"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Άνοιγμα σε Νέο Παράθυρο"
 
@@ -691,7 +709,7 @@ msgstr "Άνοιγμα Τοποθεσίας"
 msgid "_Location:"
 msgstr "_Τοποθεσία:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Η εκκίνηση της ενέργειας `%s' απέτυχε."
@@ -1023,168 +1041,183 @@ msgstr "%s (%u Bytes)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Η μετονομασία του `%s' απέτυχε"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 msgid "_Remove Shortcut"
 msgstr "_Απομάκρυνση Συντόμευσης"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 msgid "Re_name Shortcut"
 msgstr "Μετο_νομασία Συντόμευσης"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "Η διαδρομή '%s' δεν αντιστοιχεί σε κατάλογο"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 msgid "Failed to add new shortcut"
 msgstr "Η προσθήκη νέας συντόμευσης απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr "Δημιουργία _Φακέλου..."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr "Δημιουργία ενός άδειου φακέλου μέσα στον τρέχον φάκελο"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Ιδιότητες"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr "Προβολή των ιδιοτήτων του επιλεγμένου αρχείου"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "_Αντιγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr "Αντιγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "Α_ποκοπή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr "Αποκοπή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 msgid "_Paste Files"
 msgstr "_Επικόλληση Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "_Delete Files"
 msgstr "_Διαγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr "Διαγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr "Επικόλληση Αρχείων σε Φάκελο"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Επικόλληση αρχείων στον επιλεγμένο φάκελο"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "Επιλογή ό_λων των Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Επιλογή όλων των αρχείων σε αυτό το παράθυρο"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select _by Pattern..."
 msgstr "Επιλογή _βάσει μοτίβου..."
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Επιλογή όλων των αρχείων που ταιριάζουν σε ένα μοτίβο"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Δημιουργία _Δεσμού"
 msgstr[1] "Δημιουργία _Δεσμών"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr "Δημιουργεί ένα συμβολικό δεσμό για κάθε επιλεγμένο αρχείο"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr "Μετονομασία του επιλεγμένου αρχείου"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "Δημιουργία Ενέργειας"
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Φόρτωμα περιεχομένων φακέλου..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Νέος Φάκελος..."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder"
 msgstr "Νέος Φάκελος"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder..."
 msgstr "Νέος Φάκελος..."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
+msgid "Create Document from template \"%s\""
 msgstr ""
-"Δεν είναι δυνατή η μετατροπή του ονόματος αρχείου `%s' στην τοπική "
-"κωδικοποίηση"
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1193,7 +1226,7 @@ msgstr ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά το \"%s\";"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1208,36 +1241,36 @@ msgstr[1] ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά τα %u επιλεγμένα αρχεία;"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr "Εάν διαγράψετε ένα αρχείο, χάνετε για πάντα."
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "Επιλογή βάσει Μοτίβου"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Μοτίβο:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Το άνοιγμα του καταλόγου `%s' απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Αντιγραφή Αρχείου"
 msgstr[1] "_Αντιγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Αποκοπή _Αρχείου"
 msgstr[1] "Αποκοπή _Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Διαγραφή Αρχείου"
@@ -1259,171 +1292,209 @@ msgstr "Κείμενο μπάρας κατάστασης"
 msgid "The main text to be displayed in the statusbar"
 msgstr "Το κυρίως κείμενο που θα εμφανίζεται στη μπάρα κατάστασης"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Άνοιγμα νέου _παραθύρου"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 "'Ανοιγμα ενός άλλου παράθυρου του Thunar για την προβαλλόμενη τοποθεσία"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "Κλείσιμο _Όλων των Παραθύρων"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Κλείσιμο όλων των παραθύρων του Thunar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Κλείσιμο αυτού του παραθύρου"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr "_Προτιμήσεις..."
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Edit Thunars Preferences"
 msgstr "Επεξεργασία Προτιμήσεων του Thunar"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 msgid "_Location Selector"
 msgstr "Εργαλειοθήκη _Τοποθεσίας"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "_Πλευρικό Ταμπλό"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "Άνοιγμα _Γονικού"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Άνοιγμα του γονικού φακέλου"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 msgid "_Home"
 msgstr "_Αρχή"
 
-#: ../thunar/thunar-window.c:177
-msgid "Open the home folder"
+#: ../thunar/thunar-window.c:188
+#, fuzzy
+msgid "Go to the home folder"
 msgstr "Άνοιγμα του αρχικού φακέλου"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Μετάβαση στον επόμενο φάκελο που επισκεφτήκατε"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "Άνοιγμα _Τοποθεσίας..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Καθορίστε μια τοποθεσία για άνοιγμα"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "_Περί"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το Thunar"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Show _Hidden Files"
 msgstr "Εμφάνιση _Κρυφών Αρχείων"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Εναλλάσσει την εμφάνιση κρυφών αρχείων στο τρέχον παράθυρο"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr "_Συντομεύσεις"
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "Κ_ρυφό"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 msgid "_Pathbar Style"
 msgstr "_Μπάρα Τοποθεσίας"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Σύγχρονη προσέγγιση με κουμπιά που αντιστοιχούν σε φακέλους"
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 msgid "_Toolbar Style"
 msgstr "_Εργαλειοθήκη"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Παραδοσιακή προσέγγιση με μπάρα τοποθεσίας και κουμπιά περιήγησης"
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr "Χωρίς επιλογέα τοποθεσίας"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Ε_ικονίδια"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως εικονίδια"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "_Λεπτομέρειες"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως λεπτομερή λίστα"
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Άνοιγμα του γονικού φακέλου"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 msgid "Failed to open home directory"
 msgstr "Αδυναμία ανοίγματος αρχικού καταλόγου"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Άνοιγμα του γονικού φακέλου"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1431,7 +1502,7 @@ msgstr ""
 "Ο Thunar είναι ένας γρήγορος και εύκολος διαχειριστής αρχείων\n"
 "για το Περιβάλλον Εργασίας Xfce."
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>"
 
diff --git a/po/es.po b/po/es.po
index 92f63b478a9dfc53cb2b1fa682e742351fd39fdc..35cdcc45b20bcb6d6fe57fed2a0c020b4c2dac69 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+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"
@@ -39,44 +39,46 @@ msgstr ""
 "\n"
 "¿Quiere dejarlo como está?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "Campo de ejecución no especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "Imposible interpretar archivo"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "Nombre de archivo inválido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, fuzzy, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Imposible renombrar %s."
@@ -230,73 +232,74 @@ msgstr[1] ""
 msgid "Failed to create directory `%s'"
 msgstr "Imposible crear el directorio %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, fuzzy, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, fuzzy, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, fuzzy, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, fuzzy, c-format
 msgid "Failed to remove `%s'"
 msgstr "Imposible renombrar %s."
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, fuzzy, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Imposible seguir el enlace de %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, fuzzy, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Imposible crear el enlace de %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, fuzzy, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Imposible copiar el archivo %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, fuzzy, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Imposible crear el enlace de %s."
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -306,23 +309,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Copiando archivos..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr ""
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Moviendo archivos..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Borrando archivos..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Borrando archivos..."
+
+#: ../thunar/thunar-application.c:662
 #, fuzzy
 msgid "Creating directories..."
 msgstr "Directorio actual"
@@ -438,10 +446,16 @@ msgstr "Otra aplicación..."
 msgid "There is nothing on the clipboard to paste"
 msgstr "No hay nada en el portapapeles que pueda ser pegado"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr ""
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr ""
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Nombre"
@@ -590,8 +604,9 @@ msgid "Icon view"
 msgstr "Vista de iconos"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -600,7 +615,8 @@ msgid "Open the selected items"
 msgstr "Abrir el elemento seleccionado"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
@@ -699,7 +715,7 @@ msgstr "Abrir dirección..."
 msgid "_Location:"
 msgstr "_Dirección"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Imposible renombrar %s."
@@ -1033,191 +1049,207 @@ msgstr "%s (%u Bytes)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Imposible renombrar %s."
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 #, fuzzy
 msgid "_Remove Shortcut"
 msgstr "_Borrar marcador"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 #, fuzzy
 msgid "Re_name Shortcut"
 msgstr "Re_nombrar marcador"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr ""
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 #, fuzzy
 msgid "Failed to add new shortcut"
 msgstr "No se puede añadir el marcador"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr "Menú contextual de archivo"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr "Menú contextual de carpeta"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Ver las propiedades del elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 #, fuzzy
 msgid "_Copy Files"
 msgstr "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 #, fuzzy
 msgid "_Paste Files"
 msgstr "_Pegar archivos"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Archivos seleccionados"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Pegar archivos en la carpeta"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Pegar archivos en la carpeta seleccionada"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Seleccionar _todos los archivos"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Seleccionar todos los archivos en esta ventana"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Patrón de selección"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona todos los archivos que coinciden con un patrón"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Renombrar..."
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Renombra el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+msgid "Create _Document"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Cargando el contenido de la carpeta..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Carpeta"
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder"
 msgstr "Carpeta"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder..."
 msgstr "Carpeta"
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
+msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1230,39 +1262,39 @@ msgstr[0] ""
 msgstr[1] ""
 "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Patrón de selección"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Patrón:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar archivo"
 msgstr[1] "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Cor_tar archivo"
 msgstr[1] "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1285,180 +1317,217 @@ msgstr "Texto de la barra de estado"
 msgid "The main text to be displayed in the statusbar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Nueva _ventana"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "Cerrar _todas las ventanas"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Cerrar todas las ventanas de Thunar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Gestor de archivos"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Ver"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Barra de _dirección"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "Panel _lateral"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Ir a"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "Abrir _antecesor"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Abre la carpeta anterior"
 
 # msgstr "Sistema de archivos"
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
 msgid "_Home"
 msgstr "Casa"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
-msgid "Open the home folder"
+msgid "Go to the home folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Abre la carpeta anterior"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "Abrir _dirección..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Especificar una dirección para abrir"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Muestra información acerca de Thunar"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostrar los archivos _ocultos"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "_Oculto/a"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Estilo _tradicional"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Estilo _tradicional"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Ver como _Iconos"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "Ver como _Lista"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Abre la carpeta anterior"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Abre la carpeta anterior"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1466,7 +1535,7 @@ msgstr ""
 "Thunar es un gestor de archivos rápido\n"
 "y fácil de usar para el escritorio Xfce"
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 377b9e6be09e9f0fc361c3ead03b44513cd7219c..cfee4f678c978e9f7fb65f6d5faa834b6c1cef29 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+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"
@@ -39,44 +39,46 @@ msgstr ""
 "\n"
 "Voulez-vous l'ignorer ?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Échec à la détermination d'informations sur le fichier `%s'"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Échec au changement de mode de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Échec au changement de mode de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Échec au changement de mode de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "Aucun champ Exec spécifié"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "Impossible d'analyser le fichier"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "Nom de fichier invalide"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "Fichier de bureau invalide"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Échec pour récupérer le statut du fichier `%s' : %s"
@@ -229,73 +231,74 @@ msgstr[1] "%uème lien vers %s"
 msgid "Failed to create directory `%s'"
 msgstr "Échec à la création du répertoire `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "Échec à la création du tube nommé `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "Échec à l'ouverture de `%s' en lecture"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "Échec à l'ouverture de `%s' en écriture"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Échec à la lecture de données de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Échec à l'écriture de données vers `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "Échec à la suppression de `%s'"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Échec à la lecture de la cible du lien de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Échec à la création du lien symbolique `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Échec au changement de mode de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Échec à la détermination d'informations sur le fichier `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Échec à la copie du fichier spécial `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Échec à la création du lien symbolique `%s'"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -304,23 +307,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "Échec au lancement de l'opération"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Copie des fichiers..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "Création de liens symboliques..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Déplacement de fichiers..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Suppression des fichiers..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Récupération des fichiers..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "Création de répertoires..."
 
@@ -430,10 +438,16 @@ msgstr "Autres applications :"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Il n'y a rien à coller dans le presse-papier"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "Entrer le nouveau nom :"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr "Ne peut pas convertir le nom du fichier `%s' vers le codage local"
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Nom"
@@ -581,8 +595,9 @@ msgid "Icon view"
 msgstr "Vue d'icônes"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -591,7 +606,8 @@ msgid "Open the selected items"
 msgstr "Ouvrir les éléments sélectionnés"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
@@ -690,7 +706,7 @@ msgstr "Aller à..."
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Échec au lancement de l'action `%s'."
@@ -1027,166 +1043,183 @@ msgstr "%s (%u octets)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Échec au changement de nom de `%s'"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 msgid "_Remove Shortcut"
 msgstr "_Supprimer raccourci"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 msgid "Re_name Shortcut"
 msgstr "_Renommer raccourci"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "Le chemin '%s' ne fait pas référence à un répertoire"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 msgid "Failed to add new shortcut"
 msgstr "Échec à l'ajout d'un nouveau raccourci"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr "Menu contextuel de fichier"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr "Menu contextuel de dossier"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr "Création d'un _dossier..."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr "Crée un dossier vide dans le dossier courant"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propriétés"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr "Affiche les propriétés du fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "_Copier les fichiers"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr "Copie les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "Cou_per les fichiers"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr "Coupe les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 msgid "_Paste Files"
 msgstr "Co_ller les fichiers"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "_Delete Files"
 msgstr "_Supprimer les fichiers"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr "Supprime les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr "Colle les fichiers dans le dossier"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Colle les fichiers dans le dossier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "Sélectionner _tout les fichiers"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Sélectionner tous les fichiers dans cette fenêtre"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select _by Pattern..."
 msgstr "Sélectionner par _motif..."
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Sélectionner tous les fichiers qui correspondent à un certain motif"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_pliquer le fichier"
 msgstr[1] "Du_pliquer les fichiers"
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr "Duplique chaque fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "C_réer un lien"
 msgstr[1] "C_réer des liens"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr "Créer un lien symbolique pour chaque fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr "Renommer le fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "Créer une action"
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Chargement du contenu du dossier..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Nouveau dossier..."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder..."
 msgstr "Nouveau dossier..."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
-msgstr "Ne peut pas convertir le nom du fichier `%s' vers le codage local"
+msgid "Create Document from template \"%s\""
+msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1195,7 +1228,7 @@ msgstr ""
 "Êtes-vous certain que vous voulez\n"
 "effacer \"%s\" définitivement ?"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1210,36 +1243,36 @@ msgstr[1] ""
 "Êtes-vous certain de vouloir effacer de manière\n"
 "permanente les %u fichiers sélectionnés ?"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr "Si vous supprimez ce fichier, il sera définitivement perdu."
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "Sélectionner par motif"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Motif :"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Échec à l'ouverture du répertoire `%s'"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copier le fichier"
 msgstr[1] "_Copier les fichiers"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Co_uper le fichier"
 msgstr[1] "Co_uper les fichiers"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Supprimer le fichier"
@@ -1261,172 +1294,210 @@ msgstr "Texte de la barre de statut"
 msgid "The main text to be displayed in the statusbar"
 msgstr "Le texte principal à afficher dans la barre de statut"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Ouvrir une _nouvelle fenêtre"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 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:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "Fermer _toutes les fenêtres"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Ferme toutes les fenêtres de Thunar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "Édit_er"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr "Préfér_ences..."
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Edit Thunars Preferences"
 msgstr "Éditer les préférences de Thunar"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Voir"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "_Panneau latéral"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Aller"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "Ouvrir le _père"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 msgid "_Home"
 msgstr "_Répertoire personnel"
 
-#: ../thunar/thunar-window.c:177
-msgid "Open the home folder"
+#: ../thunar/thunar-window.c:188
+#, fuzzy
+msgid "Go to the home folder"
 msgstr "Ouvrir le répertoire personnel"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Aller vers le répertoire visité suivant"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "A_ller à..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Spécifier un chemin à ouvrir"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "À _propos"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Affiche des informations à propos de Thunar"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Show _Hidden Files"
 msgstr "Montrer les fichiers _cachés"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Montrer/cache les fichiers cachés dans la fenêtre courante"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr "_Raccourcis"
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "_Caché"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 msgid "_Pathbar Style"
 msgstr "Style de la barre de _chemin"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Approche moderne avec les boutons qui correspondent aux dossiers"
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 msgid "_Toolbar Style"
 msgstr "Style de la barre d'_outils"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 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:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Voir en _icônes"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 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:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "Voir en liste _détaillée"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 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:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Ouvrir le dossier père"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 msgid "Failed to open home directory"
 msgstr "Échec dans l'ouverture du répertoire personnel"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Ouvrir le dossier père"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1434,7 +1505,7 @@ msgstr ""
 "Thunar est un gestionnaire de fichier rapide et facile\n"
 "d'utilisation pour l'Environnement de Bureau Xfce."
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "crédits-traducteur"
 
diff --git a/po/hu.po b/po/hu.po
index 3d8ca7f07a65eae49ff326aeb03be65414fcbd1d..9f42572886941775d70fbbd77d0b3a3ddec91f0e 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+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"
@@ -38,45 +38,47 @@ msgstr ""
 "\n"
 "Kihagyod?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Nem sikerült meghatározni a szülő URI-t ehhez: %s"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 #, fuzzy
 msgid "Unable to parse file"
 msgstr "Nem nyitható meg e fájl: %s"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, fuzzy, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Nem törölhető: %s"
@@ -229,73 +231,74 @@ msgstr[1] ""
 msgid "Failed to create directory `%s'"
 msgstr "Nem hozható létre ez a könyvtár: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, fuzzy, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, fuzzy, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, fuzzy, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, fuzzy, c-format
 msgid "Failed to remove `%s'"
 msgstr "Nem törölhető: %s"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, fuzzy, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Nem sikerült meghatározni a szülő URI-t ehhez: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, fuzzy, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Nem hozható létre e szimlink: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, fuzzy, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, fuzzy, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Nem sikerült meghatározni a szülő URI-t ehhez: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, fuzzy, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Nem lehet másolni a fájlt: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, fuzzy, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Nem hozható létre e szimlink: %s"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -305,24 +308,29 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Fájlok másolása..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr ""
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Fájlok mozgatása..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 #, fuzzy
 msgid "Deleting files..."
 msgstr "Fájlok gyűjtése..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Fájlok gyűjtése..."
+
+#: ../thunar/thunar-application.c:662
 #, fuzzy
 msgid "Creating directories..."
 msgstr "Jelenlegi könyvtár"
@@ -438,10 +446,16 @@ msgstr "_Hely megnyitása..."
 msgid "There is nothing on the clipboard to paste"
 msgstr "Nincs beillesztenivaló a vágólapon"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr ""
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr ""
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Név"
@@ -590,8 +604,9 @@ msgid "Icon view"
 msgstr "Ikonnézet"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr ""
 
@@ -601,7 +616,8 @@ msgid "Open the selected items"
 msgstr "A kijelölt elem tulajdonságai"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Új _Ablak"
@@ -700,7 +716,7 @@ msgstr "Hely megnyitása"
 msgid "_Location:"
 msgstr "_Hely:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Nem törölhető: %s"
@@ -1034,191 +1050,207 @@ msgstr "%s (%u bájt)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Nem törölhető: %s"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 msgid "_Remove Shortcut"
 msgstr ""
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 msgid "Re_name Shortcut"
 msgstr ""
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr ""
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 #, fuzzy
 msgid "Failed to add new shortcut"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Helyi menü"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Helyi menü"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "Tulajdonságok"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 #, fuzzy
 msgid "_Copy Files"
 msgstr "Fájlok másolása"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Fájlok kivágása"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Fájlok beillesztése"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Minden fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Fájlok mappába illesztése"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Fájlok beillesztése a kijelölt mappába"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Minden fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Minden fájlt kiválaszt ebből az ablakból"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Kijelölés mintával"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+msgid "Create _Document"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Mappa beolvasása..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Mappa"
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder"
 msgstr "Mappa"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder..."
 msgstr "Mappa"
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
+msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1229,39 +1261,39 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Kijelölés mintával"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Minta:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nem megnyitható könyvtár: %s"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Fájl másolás"
 msgstr[1] "Fájl másolás"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Fájl kivágás"
 msgstr[1] "Fájl kivágás"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1284,185 +1316,222 @@ msgstr "Állapotsor szöveg"
 msgid "The main text to be displayed in the statusbar"
 msgstr "Az állapotsor fő szövege"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Új _Ablak"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Új Thunar ablak az adott helyhez"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "_Minden ablak bezárása"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Bezár minden Thunar ablakot"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Bezárja ezt az ablakot"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "Sz_erkesztés"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Tulajdonságok"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Fájlkezelő"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 #, fuzzy
 msgid "_Location Selector"
 msgstr "_Címsor"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Ugrás"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "_Szülő megnyitása"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
 msgid "_Home"
 msgstr "Saját könyvtár"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
-msgid "Open the home folder"
+msgid "Go to the home folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Szülőmappa megnyitása"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "_Hely megnyitása..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Adott hely megnyitása"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "A Thunar adatainak megjelenítése"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Rejtett fájlok mutatása"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "A rejtett fájlok mutatását váltja a jelen ablakban"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "_Rejtett"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "_Hagyományos stílus"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "_Hagyományos stílus"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Szülőmappa megnyitása"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nem megnyitható könyvtár: %s"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Szülőmappa megnyitása"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index f602ff6d3efefc0e25c99cf7e2ceb6531b8fb080..cd2f9993c1bb4867c012aba72bad5306d4f0028a 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+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"
@@ -42,44 +42,46 @@ msgstr ""
 "\n"
 "Si desidera saltarlo?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Impossibile reperire informazioni del file `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Impossibile cambiare permessi di `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Impossibile cambiare proprietario del file `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Impossibile cambiare gruppo del file `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "Campo Exec non specificato"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "Impossibile fare il parsing del file"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "Nome del file non valido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "Desktop file non valido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Stat del file `%s' fallito: %s"
@@ -232,73 +234,74 @@ msgstr[1] ""
 msgid "Failed to create directory `%s'"
 msgstr "Impossibile creare la directory `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "Impossibile creare fifo con nome `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "Impossibile aprire `%s' in lettura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "Impossibile aprire `%s' in scrittura"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Impossibile leggere dati da `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Impossibile scrivere dati su `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "Impossibile rimuovere `%s'"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Impossibile creare link simbolico `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Impossibile cambiare modalità di `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Impossibile reperire informazioni per il file `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Impossibile copiare il file speciale `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Impossibile creare link simbolico `%s'"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -307,23 +310,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "Impossibile lanciare l'operazione"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Copia dei file in corso..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "Creazione dei link simbolici in corso..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Spostamento dei file in corso..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Eliminazione dei file in corso..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Raccolta file in corso..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "Creazione directory in corso..."
 
@@ -433,10 +441,16 @@ msgstr "Altre applicazioni:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Nella clipboard non c'è niente da incollare"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "Inserire il nuovo nome:"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr ""
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Nome"
@@ -587,8 +601,9 @@ msgid "Icon view"
 msgstr "Vista a icone"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Apri"
 
@@ -597,7 +612,8 @@ msgid "Open the selected items"
 msgstr "Apri gli elementi selezionati"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Apri in una nuova finestra"
 
@@ -697,7 +713,7 @@ msgstr "Apri percorso"
 msgid "_Location:"
 msgstr "Percorso:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Impossibile lanciare `%s'"
@@ -1020,169 +1036,186 @@ msgstr "%s (%u Byte)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Impossibile rinominare `%s'"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 msgid "_Remove Shortcut"
 msgstr "_Rimuovi shortcut"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 msgid "Re_name Shortcut"
 msgstr "Ri_nomina shortcut"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "La path '%s' non si riferisce ad una directory"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 msgid "Failed to add new shortcut"
 msgstr "Impossibile aggiungere nuovo shortcut"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea directory..."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr "Crea una directory vuota dentro la directory corrente"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr "Mostra le proprietà dell'elemento selezionato"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "_Copia file"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr "Copia gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "_Taglia file"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr "Taglia gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Incolla file"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Elimina file"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr "Elimina gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr "Incolla file dentro la directory"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Incolla file dentro la directory selezionata"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "Selezion_a tutti"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Seleziona tutti i file in questa finestra"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select _by Pattern..."
 msgstr "Seleziona in _base ad un pattern..."
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Seleziona tutti i file che corrispondono a un certo pattern"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_plica file"
 msgstr[1] "Du_plica file"
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr "Duplica ogni file selezionato"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea link"
 msgstr[1] "Crea link"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr "Crea un link simbolico per ognuno dei file selezionati"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr "Rinomina il file selezionato"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "Crea azione"
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Caricamento dei contenuti della cartella in corso..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Nuova directory..."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder"
 msgstr "Nuova directory"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder..."
 msgstr "Nuova directory..."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
+msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1191,7 +1224,7 @@ msgstr ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1206,36 +1239,36 @@ msgstr[1] ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente i %u file selezionati?"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr "Se si cancella un file, questo è perso per sempre."
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "Seleziona in base ad un pattern"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Pattern:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Impossibile aprire la directory %s."
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copia file"
 msgstr[1] "_Copia file"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Taglia file"
 msgstr[1] "_Taglia file"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1258,113 +1291,123 @@ msgstr "Testo della barra di stato"
 msgid "The main text to be displayed in the statusbar"
 msgstr "Il testo principale da mostrare nella barra di stato "
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_File"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 #, fuzzy
 msgid "Open New _Window"
 msgstr "Apri nuova finestra"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 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:168
+#: ../thunar/thunar-window.c:179
 #, fuzzy
 msgid "Close _All Windows"
 msgstr "Chiudi tutte le finestre"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Chiudi tutte le finestre Thunar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 #, fuzzy
 msgid "_View"
 msgstr "Vista"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Selettore di percorsi"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Pannello laterale"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 #, fuzzy
 msgid "_Go"
 msgstr "Vai"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 #, fuzzy
 msgid "Open _Parent"
 msgstr "Apri precedente"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Apri la directory precedente"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 msgid "_Home"
 msgstr "_Home"
 
-#: ../thunar/thunar-window.c:177
-msgid "Open the home folder"
+#: ../thunar/thunar-window.c:188
+#, fuzzy
+msgid "Go to the home folder"
 msgstr "Apri la directory home"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Vai alla directory visitata successivamente"
+
+#: ../thunar/thunar-window.c:190
 #, fuzzy
 msgid "Open _Location..."
 msgstr "Apri percorso..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 #, fuzzy
 msgid "Specify a location to open"
 msgstr "Specificare un percorso da aprire"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "_Informazioni su..."
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Mostra informazioni su Thunar"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 "Dis/abilita la visualizzazione di file nascosti nella finestra corrente"
@@ -1372,11 +1415,11 @@ msgstr ""
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 #, fuzzy
 msgid "_Hidden"
 msgstr "Nascondi"
@@ -1384,55 +1427,83 @@ msgstr "Nascondi"
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Vedi come _icone"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "Vedi come lista _dettagliata"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 msgid "Failed to open parent folder"
 msgstr "Impossibile aprire la directory superiore"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 msgid "Failed to open home directory"
 msgstr "Impossibile aprire la directory home"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Impossibile aprire la directory superiore"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1440,7 +1511,7 @@ msgstr ""
 "Thunar è un file manager veloce e facile\n"
 "da usare per Xfce Desktop Environment."
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "Roberto Pariset <r.pariset@gmail.com>"
 
diff --git a/po/ja.po b/po/ja.po
index 07ad32a75faba167272756e2e7db30161d003ef1..688219c84fdd3e5efb8c703b72a748c99d7f55c1 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+0100\n"
 "PO-Revision-Date: 2006-01-26 00:21+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -46,44 +46,46 @@ msgstr ""
 "\n"
 "これを飛ばしますか？"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "「%s」のファイル情報を確定するのに失敗しました: %s"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "「%s」のアクセス権を変更するのに失敗しました: %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "「%s」の所有者を変更するのに失敗しました: %s"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "「%s」のグループを変更するのに失敗しました: %s"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "実行コマンドが指定されていません。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "ファイルを解析できません。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "無効なファイル名です。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "無効なデスクトップファイルです。"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "ファイル「%s」の状態を取得するのに失敗しました: %s"
@@ -241,74 +243,75 @@ msgstr[0] "%2$s への %1$u 番目のリンク"
 msgid "Failed to create directory `%s'"
 msgstr "フォルダ「%s」の作成に失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "名前つきパイプ「%s」の作成に失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "読み込むために「%s」を開くのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "書き込むために「%s」を開くのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr "「%s」からデータを読み込むのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr "「%s」へデータを書き込むのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "「%s」の削除に失敗しました。"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "操作は取り消されました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "「%s」のリンク先の読み込みに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "リンク「%s」の作成に失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "「%s」のモードを変更するのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "「%s」のファイル情報を確定するのに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "特殊ファイル「%s」のコピーに失敗しました。"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "リンク「%s」の作成に失敗しました。"
 
 # XXX: transliteration?
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -317,23 +320,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "操作の実行に失敗しました。"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "ファイルをコピーしています..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "リンクを作成しています..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "ファイルを移動しています..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "ファイルを削除しています..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "ファイルを集めています..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "フォルダを作成しています..."
 
@@ -444,10 +452,16 @@ msgstr "他のアプリケーション:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "クリップボードに貼り付けるものはありません。"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "新しい名前を入力して下さい:"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr "ファイル名「%s」をあなたのエンコード方式に変換できません。"
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "名前"
@@ -596,8 +610,9 @@ msgid "Icon view"
 msgstr "アイコン表示"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -606,7 +621,8 @@ msgid "Open the selected items"
 msgstr "選択したアイテムを開きます。"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "新規ウィンドウで開く"
 
@@ -698,7 +714,7 @@ msgstr "開く位置を指定して下さい"
 msgid "_Location:"
 msgstr "フォルダの位置(_L):"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "「%s」の実行に失敗しました。"
@@ -1032,27 +1048,27 @@ msgstr "%s (%u バイト)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "「%s」の名前変更に失敗しました。"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 msgid "_Remove Shortcut"
 msgstr "ショートカットを削除(_R)"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 msgid "Re_name Shortcut"
 msgstr "ショートカットの名前を変更(_N)"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr "シンボルアイコンを表示(_E)"
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
@@ -1060,137 +1076,154 @@ msgstr ""
 "ショートカットのリストにある全てのファイルにシンボルアイコンを表示します。こ"
 "れらのシンボルはファイルプロパティのダイアログで定義されています。"
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "パス「%s」はフォルダを参照していません。"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 msgid "Failed to add new shortcut"
 msgstr "ショートカットの追加に失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr "ファイルの右クリックメニュー"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr "フォルダの右クリックメニュー"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr "フォルダを作成(_F)..."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr "現在のフォルダに空のフォルダを作成します。"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr "選択したファイルのプロパティを表示します。"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "コピー(_C)"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr "選択したファイルをコピーします。"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "切り取り(_T)"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr "選択したファイルを切り取ります。"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 msgid "_Paste Files"
 msgstr "貼り付け(_P)"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "_Delete Files"
 msgstr "削除(_D)"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr "選択したファイルを削除します。"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr "ファイルをフォルダに貼り付け"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "選択したフォルダにファイルを貼り付けます。"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "全てのファイルを選択(_A)"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "このウィンドウの全てのファイルを選択します。"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select _by Pattern..."
 msgstr "パターンで選択(_B)..."
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "ある特定のパターンに一致する全てのファイルを選択します。"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "コピーを作成(_P)"
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr "選択したそれぞれのファイルのコピーを作成します。"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "リンクを作成(_K)"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr "選択したそれぞれのファイルのリンクを作成します。"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "名前変更(_R)"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr "選択したファイルの名前を変更します。"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "アクションを作成"
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "フォルダの内容を読み込んでいます..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "新規フォルダ..."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder"
 msgstr "新規フォルダ"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder..."
 msgstr "新規フォルダ..."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
-msgstr "ファイル名「%s」をあなたのエンコード方式に変換できません。"
+msgid "Create Document from template \"%s\""
+msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1199,7 +1232,7 @@ msgstr ""
 "「%s」は永久に削除されます\n"
 "それでもよろしいですか？"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1211,34 +1244,34 @@ msgstr[0] ""
 "選択したファイルは永久に削除されます\n"
 "それでもよろしいですか？"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr "削除されたファイルは永久に失われます。"
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "パターンで選択します"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "パターン:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "フォルダ「%s」を開くのに失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "コピー(_C)"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "切り取り(_T)"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "削除(_D)"
@@ -1259,169 +1292,208 @@ msgstr "ステータスバーのテキスト"
 msgid "The main text to be displayed in the statusbar"
 msgstr "ステータスバーに表示されるメインテキストです。"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "新規ウィンドウを開く(_W)"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open a new Thunar window for the displayed location"
 msgstr "表示されている場所のウィンドウを新しく開きます。"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "全ウィンドウを閉じる(_A)"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Thunar の全てのウィンドウを閉じます。"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "このウィンドウを閉じます。"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr "環境設定(_P)..."
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Edit Thunars Preferences"
 msgstr "Thunar の環境設定を変更します。"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 msgid "_Location Selector"
 msgstr "位置セレクター(_L)"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "サイドペイン(_S)"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "移動(_G)"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "上位フォルダを開く(_P)"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "上の階層にあるフォルダを開きます。"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 msgid "_Home"
 msgstr "ホーム(_H)"
 
-#: ../thunar/thunar-window.c:177
-msgid "Open the home folder"
+#: ../thunar/thunar-window.c:188
+#, fuzzy
+msgid "Go to the home folder"
 msgstr "ホームフォルダを開きます。"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "次のフォルダに移動します。"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "指定位置を開く(_L)..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "フォルダの位置を指定して開きます。"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "このプログラムについて(_A)"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Thunar についての情報を表示します。"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Show _Hidden Files"
 msgstr "隠しファイルを表示(_H)"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "現在のウィンドウで隠しファイルの表示/非表示を切り替えます。"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr "ショートカット(_S)"
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "表示しない(_H)"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 msgid "_Pathbar Style"
 msgstr "パスボタン方式(_T)"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "フォルダに対応するボタンを表示する今風の表示方式です。"
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 msgid "_Toolbar Style"
 msgstr "ツールバー方式(_T)"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "位置バーおよびナビゲーションボタンを表示する旧来の表示方式です。"
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr "いずれの位置セレクターも表示しません。"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "アイコン表示(_I)"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr "フォルダの内容をアイコンで表示します。"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "詳細リスト表示(_D)"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr "フォルダの内容を詳細なリストで表示します。"
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 msgid "Failed to open parent folder"
 msgstr "上位のフォルダを開くのに失敗しました。"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 msgid "Failed to open home directory"
 msgstr "ホームフォルダを開くのに失敗しました。"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+#, fuzzy
+msgid "Do _not display this message again"
+msgstr "再び尋ねない(_N)"
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "上位のフォルダを開くのに失敗しました。"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1429,7 +1501,7 @@ msgstr ""
 "Thunar は Xfce デスクトップ環境向けの\n"
 "使いやすい軽快なファイルマネージャーです。"
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "Daichi Kawahata <daichi@xfce.org>"
 
diff --git a/po/pl.po b/po/pl.po
index da03677c984067cecc158111c10799c1f7ba3be3..2a1ad96e5ca285e7b220d065a7327331a17ef940 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+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"
@@ -39,44 +39,46 @@ msgstr ""
 "\n"
 "Czy chcesz go pominąć?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Nie udało się odczytać atrybutów pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Nie udało się zmienić praw dostępu do '%s'"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Nie udało się zmienić praw dostępu do '%s'"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Nie udało się zmienić praw dostępu do '%s'"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "Brak pola Exec"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "Nie mogę wczytać pliku"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "Nieprawidłowa nazwa pliku"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "Nieprawidłowy plik .desktop"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Nie mogę odczytać atrybutów pliku '%s': %s"
@@ -231,73 +233,74 @@ msgstr[2] "%u. Å‚Ä…cze do %s"
 msgid "Failed to create directory `%s'"
 msgstr "Nie udało się utworzyć katalogu '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "Nie udało się utworzyć kolejki FIFO '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "Nie można otworzyć '%s' do odczytu"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "Nie można otworzyć '%s' do zapisu"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr "BÅ‚Ä…d odczytu z pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr "BÅ‚Ä…d zapisu do pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "Nie udało się usunąć '%s'"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Nie można odczytać obiektu, na który wskazuje '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Nie udało się utworzyć dowiązania symbolicznego '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Nie udało się zmienić praw dostępu do '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Nie udało się odczytać atrybutów pliku '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Nie udało się skopiować pliku specjalnego '%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Nie udało się utworzyć dowiązania '%s'"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr ""
 
@@ -307,23 +310,28 @@ msgstr ""
 msgid "Failed to launch operation"
 msgstr "Nie udało się dodać aplikacji %s."
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Kopiowanie plików..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "Tworzenie dowiązań..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Przenoszenie plików..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Usuwanie plików..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "WyszukujÄ™ pliki..."
+
+#: ../thunar/thunar-application.c:662
 #, fuzzy
 msgid "Creating directories..."
 msgstr "Usuwam katalogi..."
@@ -434,10 +442,16 @@ msgstr "Inne aplikacje:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "W schowku nie ma nic do wklejenia"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr ""
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr ""
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Nazwa"
@@ -586,8 +600,9 @@ msgid "Icon view"
 msgstr "Widok ikon"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -596,7 +611,8 @@ msgid "Open the selected items"
 msgstr "Otwórz zaznaczone elementy"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Otwórz w nowym oknie"
 
@@ -700,7 +716,7 @@ msgstr "Otwórz plik/katalog"
 msgid "_Location:"
 msgstr "Położenie:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Nie udało się usunąć '%s'"
@@ -1036,181 +1052,197 @@ msgstr "%s (%u bajtów)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Nie udało się zmienić nazwy %s."
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 #, fuzzy
 msgid "_Remove Shortcut"
 msgstr "_Usuń element"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 #, fuzzy
 msgid "Re_name Shortcut"
 msgstr "Zmień _nazwę"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, fuzzy, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "Identyfikator URI '%s' nie wskazuje na katalog"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 #, fuzzy
 msgid "Failed to add new shortcut"
 msgstr "Nie udało się dodać aplikacji %s."
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr "Menu kontekstowe pliku"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr "Menu kontekstowe katalogu"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Właściwości"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr "Wyświetl właściwości zaznaczonego elementu"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "S_kopiuj pliki"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr "Skopiuj zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "_Wytnij pliki"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr "Wytnij zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 msgid "_Paste Files"
 msgstr "W_klej pliki"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "_Delete Files"
 msgstr "_Usuń pliki"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr "Usuń zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr "Wklej pliki do katalogu"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Wklej pliki do wybranego katalogu"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "Zaznacz wszystkie pliki"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Zaznacz wszystkie pliki w tym katalogu"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Zaznacz według wzorca"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Zaznacz wszystkie pliki pasujÄ…ce do wzorca"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Z_duplikuj plik"
 msgstr[1] "Z_duplikuj pliki"
 msgstr[2] "Z_duplikuj pliki"
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr "Zduplikuj wszystkie zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Utwórz _łącze"
 msgstr[1] "Utwórz _łącza"
 msgstr[2] "Utwórz _łącza"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr "Utwórz dowiązania do wszystkich zaznaczonych plików"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "Zmień _nazwę"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr "Zmień nazwę zaznaczonego pliku"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+msgid "Create _Document"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Wczytuję zawartość katalogu..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Katalog"
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder"
 msgstr "Katalog"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 #, fuzzy
 msgid "New Folder..."
 msgstr "Katalog"
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
+msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1222,38 +1254,38 @@ msgstr[0] "Czy na pewno chcesz trwale usunąć wybrany plik?"
 msgstr[1] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
 msgstr[2] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr "Jeśli usuniesz plik, nie będzie można go odzyskać."
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "Zaznacz według wzorca"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Wzorzec nazwy:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "S_kopiuj plik"
 msgstr[1] "S_kopiuj pliki"
 msgstr[2] "S_kopiuj pliki"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Wytnij plik"
 msgstr[1] "_Wytnij pliki"
 msgstr[2] "_Wytnij pliki"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Usuń plik"
@@ -1276,176 +1308,213 @@ msgstr "Tekst paska statusu"
 msgid "The main text to be displayed in the statusbar"
 msgstr "Tekst wyświetlany w pasku statusu"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Plik"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Otwórz nowe _okno"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Otwórz wyświetlaną zawartość w nowym oknie"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "Zamknij wszystkie okna"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Zamknij wszystkie okna menedżera plików Thunar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Widok"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Pasek _położenia"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "Panel _boczny"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "W _górę"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
 msgid "_Home"
 msgstr "Katalog domowy"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 #, fuzzy
-msgid "Open the home folder"
+msgid "Go to the home folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Przejdź do następnego katalogu"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "Otwórz plik/katalog..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Podaj położenie pliku/katalogu do otwarcia"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Wyświetl informacje o programie Thunar"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Show _Hidden Files"
 msgstr "Pokaż _ukryte pliki"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Włącza/wyłącza pokazywanie ukrytych plików"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "Niewidoczny"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Styl tradycyjny"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Styl tradycyjny"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Widok _ikon"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "Widok _szczegółowy"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Otwórz katalog nadrzędny"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Otwórz katalog nadrzędny"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1453,7 +1522,7 @@ msgstr ""
 "Thunar to szybki i łatwy w użyciu menedżer plików\n"
 "dla środowiska Xfce Desktop Environment."
 
-#: ../thunar/thunar-window.c:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3a7881acabe712e2a3e54c3e54dee60823a43d8a..63561c6f0819afa9cad18145aab65b8d5ba976fc 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-01-25 19:04+0100\n"
+"POT-Creation-Date: 2006-01-28 23:55+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"
@@ -39,44 +39,46 @@ msgstr ""
 "\n"
 "Você quer pulá-lo?"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:246
-#: ../thunar-vfs/thunar-vfs-chown-job.c:244
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:253
+#: ../thunar-vfs/thunar-vfs-chown-job.c:251
 #, fuzzy, c-format
 msgid "Failed to determine file info of `%s': %s"
 msgstr "Falha em determinar informação de arquivo para `%s'"
 
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:272
+#: ../thunar-vfs/thunar-vfs-chmod-job.c:279
 #, fuzzy, c-format
 msgid "Failed to change permissions of `%s': %s"
 msgstr "Falha em trocar modo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:260
+#: ../thunar-vfs/thunar-vfs-chown-job.c:267
 #, fuzzy, c-format
 msgid "Failed to change file owner of `%s': %s"
 msgstr "Falha em trocar modo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-chown-job.c:262
+#: ../thunar-vfs/thunar-vfs-chown-job.c:269
 #, fuzzy, c-format
 msgid "Failed to change file group of `%s': %s"
 msgstr "Falha em trocar modo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-info.c:261
+#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
+#: ../thunar-vfs/thunar-vfs-info.c:262
 msgid "No Exec field specified"
 msgstr "Nenhum campo Exec especificado"
 
-#: ../thunar-vfs/thunar-vfs-info.c:269
+#: ../thunar-vfs/thunar-vfs-info.c:270
 msgid "Unable to parse file"
 msgstr "Incapaz de \"parse\" arquivo"
 
-#: ../thunar-vfs/thunar-vfs-info.c:359
+#: ../thunar-vfs/thunar-vfs-info.c:360
 msgid "Invalid file name"
 msgstr "Nome de arquivo inválido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:381
+#: ../thunar-vfs/thunar-vfs-info.c:382
 msgid "Invalid desktop file"
 msgstr "Arquivo de área de trabalho inválido"
 
-#: ../thunar-vfs/thunar-vfs-info.c:615
+#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
+#: ../thunar-vfs/thunar-vfs-info.c:617
 #, c-format
 msgid "Failed to stat file `%s': %s"
 msgstr "Falha em \"stat\" arquivo `%s': %s"
@@ -229,73 +231,74 @@ msgstr[1] "link número %u para %s"
 msgid "Failed to create directory `%s'"
 msgstr "Falha em criar diretório `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:286
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-xfer.c:287
 #, c-format
 msgid "Failed to create named fifo `%s'"
 msgstr "Falha em criar \"fifo\" de nome `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:318
+#: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
 msgstr "Falha em abrir `%s' para ler"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:330
+#: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
 msgstr "Falha em abrir `%s' para escrever"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:349
+#: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Falha em ler dados de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:365
+#: ../thunar-vfs/thunar-vfs-xfer.c:366
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Falha em escrever dados para `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:384
+#: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr "Falha em remover `%s'"
 
 #. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:389
+#: ../thunar-vfs/thunar-vfs-xfer.c:390
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:429
+#: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Falha em ler ligação alvo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:437
+#: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Falha em criar ligação simbólica `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:445
+#: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Falha em trocar modo de `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
+#: ../thunar-vfs/thunar-vfs-xfer.c:480 ../thunar-vfs/thunar-vfs-xfer.c:540
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Falha em determinar informação de arquivo para `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
+#: ../thunar-vfs/thunar-vfs-xfer.c:509
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Falha em copiar arquivo especial `%s'"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:550
+#: ../thunar-vfs/thunar-vfs-xfer.c:551
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Falha em criar simbólico `%s'"
 
 #. setup application name
-#: ../thunar/main.c:48 ../thunar/thunar-window.c:404
+#: ../thunar/main.c:48
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -304,23 +307,28 @@ msgstr "Thunar"
 msgid "Failed to launch operation"
 msgstr "Falha em lançar operação"
 
-#: ../thunar/thunar-application.c:443
+#: ../thunar/thunar-application.c:445 ../thunar/thunar-application.c:478
 msgid "Copying files..."
 msgstr "Copiando arquivos..."
 
-#: ../thunar/thunar-application.c:477
+#: ../thunar/thunar-application.c:512
 msgid "Creating symbolic links..."
 msgstr "Criando ligações simbólicas..."
 
-#: ../thunar/thunar-application.c:512
+#: ../thunar/thunar-application.c:547
 msgid "Moving files..."
 msgstr "Movendo arquivos..."
 
-#: ../thunar/thunar-application.c:547
+#: ../thunar/thunar-application.c:582
 msgid "Deleting files..."
 msgstr "Deletando arquivos..."
 
-#: ../thunar/thunar-application.c:587
+#: ../thunar/thunar-application.c:622
+#, fuzzy
+msgid "Creating files..."
+msgstr "Coletando arquivos..."
+
+#: ../thunar/thunar-application.c:662
 msgid "Creating directories..."
 msgstr "Criando diretórios..."
 
@@ -430,10 +438,16 @@ msgstr "Outras Aplicações:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Não há nada na área de transferência para colar"
 
-#: ../thunar/thunar-create-dialog.c:176
+#: ../thunar/thunar-create-dialog.c:177
 msgid "Enter the new name:"
 msgstr "Entre com o novo nome:"
 
+#. display an error message
+#: ../thunar/thunar-create-dialog.c:520
+#, c-format
+msgid "Cannot convert filename `%s' to the local encoding"
+msgstr "Não pode converter nome de arquivo `%s' para a codificação local"
+
 #: ../thunar/thunar-details-view.c:163
 msgid "Name"
 msgstr "Nome"
@@ -581,8 +595,9 @@ msgid "Icon view"
 msgstr "Visualização de ícone"
 
 #. the "Open" action
+#. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:218 ../thunar/thunar-launcher.c:550
-#: ../thunar/thunar-launcher.c:568
+#: ../thunar/thunar-launcher.c:568 ../thunar/thunar-shortcuts-view.c:354
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -591,7 +606,8 @@ msgid "Open the selected items"
 msgstr "Abrir os itens selecionados"
 
 #. the "Open in New Window" action
-#: ../thunar/thunar-launcher.c:222
+#. append the "Open in New Window" menu action
+#: ../thunar/thunar-launcher.c:222 ../thunar/thunar-shortcuts-view.c:365
 msgid "Open in New Window"
 msgstr "Abrir em Nova Janela"
 
@@ -689,7 +705,7 @@ msgstr "Abrir Endereço"
 msgid "_Location:"
 msgstr "_Endereço:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1010
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1163
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Falha em lançar operação"
@@ -1026,170 +1042,187 @@ msgstr "%s (%u Bytes)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:761
-#: ../thunar/thunar-standard-view.c:2347
+#: ../thunar/thunar-standard-view.c:2438
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr "Falha em renomear `%s'"
 
 #. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:380
+#: ../thunar/thunar-shortcuts-view.c:408
 #, fuzzy
 msgid "_Remove Shortcut"
 msgstr "_Remover Favorito"
 
 #. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:395
+#: ../thunar/thunar-shortcuts-view.c:423
 #, fuzzy
 msgid "Re_name Shortcut"
 msgstr "Re_nomear Favorito"
 
 #. append the "Display icon emblems" item
-#: ../thunar/thunar-shortcuts-view.c:410
+#: ../thunar/thunar-shortcuts-view.c:438
 msgid "Display _Emblem Icons"
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:412
+#: ../thunar/thunar-shortcuts-view.c:440
 msgid ""
 "Display emblem icons in the shortcuts list for all files for which emblems "
 "have been defined in the file properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-shortcuts-view.c:729
+#: ../thunar/thunar-shortcuts-view.c:743
 #, c-format
 msgid "The path '%s' does not refer to a directory"
 msgstr "O caminho '%s' não se refere a um diretório"
 
 #. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:748
+#: ../thunar/thunar-shortcuts-view.c:762
 #, fuzzy
 msgid "Failed to add new shortcut"
 msgstr "Falha em adicionar novo favorito"
 
-#: ../thunar/thunar-standard-view.c:261
+#: ../thunar/thunar-standard-view.c:267
 msgid "File Context Menu"
 msgstr "Menu de Contexto de Arquivo"
 
-#: ../thunar/thunar-standard-view.c:262
+#: ../thunar/thunar-standard-view.c:268
 msgid "Folder Context Menu"
 msgstr "Menu de Contexto de Pasta"
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create _Folder..."
 msgstr "Criar _Pasta..."
 
-#: ../thunar/thunar-standard-view.c:263
+#: ../thunar/thunar-standard-view.c:269
 msgid "Create an empty folder within the current folder"
 msgstr "Criar uma pasta vazia dentro da pasta atual"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propriedades"
 
-#: ../thunar/thunar-standard-view.c:264
+#: ../thunar/thunar-standard-view.c:270
 msgid "View the properties of the selected file"
 msgstr "Visualizar as propriedades do arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "_Copy Files"
 msgstr "_Copiar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:265
+#: ../thunar/thunar-standard-view.c:271
 msgid "Copy the selected files"
 msgstr "Copiar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cu_t Files"
 msgstr "Recor_tar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:266
+#: ../thunar/thunar-standard-view.c:272
 msgid "Cut the selected files"
 msgstr "Recortar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:267
+#: ../thunar/thunar-standard-view.c:273
 msgid "_Paste Files"
 msgstr "C_olar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "_Delete Files"
 msgstr "_Deletar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:268
+#: ../thunar/thunar-standard-view.c:274
 msgid "Delete the selected files"
 msgstr "Deletar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste Files into Folder"
 msgstr "Colar arquivos dentro da Pasta"
 
-#: ../thunar/thunar-standard-view.c:269
+#: ../thunar/thunar-standard-view.c:275
 msgid "Paste files into the selected folder"
 msgstr "Colar arquivos dentro da pasta selecionada"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select _all Files"
 msgstr "Selecionar todos os _arquivos"
 
-#: ../thunar/thunar-standard-view.c:270
+#: ../thunar/thunar-standard-view.c:276
 msgid "Select all files in this window"
 msgstr "Selecionar todos os arquivos nesta janela"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Selecionar por _Padrão"
 
-#: ../thunar/thunar-standard-view.c:271
+#: ../thunar/thunar-standard-view.c:277
 msgid "Select all files that match a certain pattern"
 msgstr "Selecionar todos os arquivos que combinam com um certo padrão"
 
-#: ../thunar/thunar-standard-view.c:272 ../thunar/thunar-standard-view.c:2629
+#: ../thunar/thunar-standard-view.c:278 ../thunar/thunar-standard-view.c:2720
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_plicar Arquivo"
 msgstr[1] "Du_plicar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:272
+#: ../thunar/thunar-standard-view.c:278
 msgid "Duplicate each selected file"
 msgstr "Duplicar cada arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:273 ../thunar/thunar-standard-view.c:2635
+#: ../thunar/thunar-standard-view.c:279 ../thunar/thunar-standard-view.c:2726
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Fazer _Ligação"
 msgstr[1] "Fazer _Ligações"
 
-#: ../thunar/thunar-standard-view.c:273
+#: ../thunar/thunar-standard-view.c:279
 msgid "Create a symbolic link for each selected file"
 msgstr "Criar uma ligação simbólica para cada arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../thunar/thunar-standard-view.c:274
+#: ../thunar/thunar-standard-view.c:280
 msgid "Rename the selected file"
 msgstr "Renomear o arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:904
+#. add the "Create Document" sub menu action
+#: ../thunar/thunar-standard-view.c:484
+#, fuzzy
+msgid "Create _Document"
+msgstr "Criar _Pasta..."
+
+#: ../thunar/thunar-standard-view.c:919
 msgid "Loading folder contents..."
 msgstr "Carregando conteúdos de pasta..."
 
-#: ../thunar/thunar-standard-view.c:1368
+#. ask the user to enter a name for the new empty file
+#: ../thunar/thunar-standard-view.c:1374
+msgid "New Empty File"
+msgstr ""
+
+#: ../thunar/thunar-standard-view.c:1374
+#, fuzzy
+msgid "New Empty File..."
+msgstr "Nova Pasta..."
+
+#. ask the user to enter a name for the new folder
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: ../thunar/thunar-standard-view.c:1371
+#: ../thunar/thunar-standard-view.c:1425
 msgid "New Folder..."
 msgstr "Nova Pasta..."
 
-#. display an error message
-#: ../thunar/thunar-standard-view.c:1385
+#. generate a title for the create dialog
+#: ../thunar/thunar-standard-view.c:1474
 #, c-format
-msgid "Cannot convert filename `%s' to the local encoding"
-msgstr "Não pode converter nome de arquivo `%s' para a codificação local"
+msgid "Create Document from template \"%s\""
+msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1546
+#: ../thunar/thunar-standard-view.c:1637
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1198,7 +1231,7 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "deletar permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1552
+#: ../thunar/thunar-standard-view.c:1643
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1213,36 +1246,36 @@ msgstr[1] ""
 "Você tem certeza que quer permanentemente\n"
 "deletar os %u arquivos selecionados?"
 
-#: ../thunar/thunar-standard-view.c:1567
+#: ../thunar/thunar-standard-view.c:1658
 msgid "If you delete a file, it is permanently lost."
 msgstr "Se você deletar um arquivo, ele é permanentemente perdido."
 
-#: ../thunar/thunar-standard-view.c:1639
+#: ../thunar/thunar-standard-view.c:1730
 msgid "Select by Pattern"
 msgstr "Selecione por Padrão"
 
-#: ../thunar/thunar-standard-view.c:1654
+#: ../thunar/thunar-standard-view.c:1745
 msgid "Pattern:"
 msgstr "Padrão:"
 
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-standard-view.c:2393
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Falha em abrir diretório `%s'"
 
-#: ../thunar/thunar-standard-view.c:2602
+#: ../thunar/thunar-standard-view.c:2693
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar Arquivo"
 msgstr[1] "_Copiar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:2608
+#: ../thunar/thunar-standard-view.c:2699
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Recor_tar Arquivo"
 msgstr[1] "Recor_tar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:2617
+#: ../thunar/thunar-standard-view.c:2708
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Deletar Arquivo"
@@ -1264,172 +1297,210 @@ msgstr "Texto da barra de status"
 msgid "The main text to be displayed in the statusbar"
 msgstr "O texto principal a ser mostrado na barra de status"
 
-#: ../thunar/thunar-window.c:166
+#: ../thunar/thunar-window.c:177
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 msgid "Open New _Window"
 msgstr "Abrir Nova _Janela"
 
-#: ../thunar/thunar-window.c:167
+#: ../thunar/thunar-window.c:178
 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:168
+#: ../thunar/thunar-window.c:179
 msgid "Close _All Windows"
 msgstr "Fechar Tod_as as Janelas"
 
-#: ../thunar/thunar-window.c:168
+#: ../thunar/thunar-window.c:179
 msgid "Close all Thunar windows"
 msgstr "Fechar todas as janelas Thunar"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "_Close"
 msgstr "Fe_char"
 
-#: ../thunar/thunar-window.c:169
+#: ../thunar/thunar-window.c:180
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: ../thunar/thunar-window.c:170
+#: ../thunar/thunar-window.c:181
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "_Preferências"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:182
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Editar Preferências do Thunar"
 
-#: ../thunar/thunar-window.c:172
+#: ../thunar/thunar-window.c:183
 msgid "_View"
 msgstr "_Visualização"
 
-#: ../thunar/thunar-window.c:173
+#: ../thunar/thunar-window.c:184
 msgid "_Location Selector"
 msgstr "_Seletor de Endereço"
 
-#: ../thunar/thunar-window.c:174
+#: ../thunar/thunar-window.c:185
 msgid "_Side Pane"
 msgstr "_Painel Lateral"
 
-#: ../thunar/thunar-window.c:175
+#: ../thunar/thunar-window.c:186
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open _Parent"
 msgstr "Abrir _Pai"
 
-#: ../thunar/thunar-window.c:176
+#: ../thunar/thunar-window.c:187
 msgid "Open the parent folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:177
+#: ../thunar/thunar-window.c:188
 msgid "_Home"
 msgstr "_Pasta Inicial"
 
-#: ../thunar/thunar-window.c:177
-msgid "Open the home folder"
+#: ../thunar/thunar-window.c:188
+#, fuzzy
+msgid "Go to the home folder"
 msgstr "Abrir a pasta inicial"
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:189
+msgid "T_emplates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:189
+#, fuzzy
+msgid "Go to the templates folder"
+msgstr "Abrir a pasta pai"
+
+#: ../thunar/thunar-window.c:190
 msgid "Open _Location..."
 msgstr "Abrir _Endereço..."
 
-#: ../thunar/thunar-window.c:178
+#: ../thunar/thunar-window.c:190
 msgid "Specify a location to open"
 msgstr "Especifique um endereço para abrir"
 
-#: ../thunar/thunar-window.c:179
+#: ../thunar/thunar-window.c:191
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../thunar/thunar-window.c:181 ../thunar/thunar-window.c:183
+#: ../thunar/thunar-window.c:192
 msgid "Display information about Thunar"
 msgstr "Mostrar informação sobre o Thunar"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Show _Hidden Files"
 msgstr "Mostrar Arquivos Invisíveis"
 
-#: ../thunar/thunar-window.c:189
+#: ../thunar/thunar-window.c:197
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Alterna a mostragem de arquivos invisíveis na janela atual"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:342
+#: ../thunar/thunar-window.c:353
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:348 ../thunar/thunar-window.c:371
+#: ../thunar/thunar-window.c:359 ../thunar/thunar-window.c:382
 msgid "_Hidden"
 msgstr "_Invisíveis"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:357
+#: ../thunar/thunar-window.c:368
 msgid "_Pathbar Style"
 msgstr "E_stilo da Barra de Caminho"
 
-#: ../thunar/thunar-window.c:358
+#: ../thunar/thunar-window.c:369
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Estilo moderno com botões que correspondem a pastas"
 
-#: ../thunar/thunar-window.c:364
+#: ../thunar/thunar-window.c:375
 msgid "_Toolbar Style"
 msgstr "Es_tilo Barra de Ferramentas"
 
-#: ../thunar/thunar-window.c:365
+#: ../thunar/thunar-window.c:376
 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:371
+#: ../thunar/thunar-window.c:382
 msgid "Don't display any location selector"
 msgstr "Não mostre qualquer seletor de endereço"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "View as _Icons"
 msgstr "Visualizar como Ícones"
 
-#: ../thunar/thunar-window.c:380
+#: ../thunar/thunar-window.c:391
 msgid "Display folder content in an icon view"
 msgstr "Mostrar conteúdo de pasta em uma visualização de ícone"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 msgid "View as _Detailed List"
 msgstr "Visualizar como Lista _Detalhada"
 
-#: ../thunar/thunar-window.c:387
+#: ../thunar/thunar-window.c:398
 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:933
+#: ../thunar/thunar-window.c:977
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Abrir a pasta pai"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:959
+#: ../thunar/thunar-window.c:1003
 msgid "Failed to open home directory"
 msgstr "Falha em abrir diretório inicial"
 
-#: ../thunar/thunar-window.c:1056
+#. display the "About Templates" dialog
+#: ../thunar/thunar-window.c:1065
+msgid "About Templates"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1086
+msgid "All files in this folder will appear in the \"Create Document\" menu."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1093
+msgid ""
+"You can create templates from documents that you frequently create. For this "
+"to work, copy a document into this folder and Thunar will have an entry for "
+"it in the \"Create Document\" menu.\n"
+"\n"
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
+msgstr ""
+
+#: ../thunar/thunar-window.c:1105
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../thunar/thunar-window.c:1118
+#, fuzzy
+msgid "Failed to open templates folder"
+msgstr "Abrir a pasta pai"
+
+#: ../thunar/thunar-window.c:1209
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1437,7 +1508,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:1061
+#: ../thunar/thunar-window.c:1214
 msgid "translator-credits"
 msgstr "Créditos de tradutores"
 
diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am
index f3a62a0f291f4bb3d13ee52df6cc26ee1a306b0d..f2ea15388ea9542a09af601f28eb48d6c01ca3ee 100644
--- a/thunar-vfs/Makefile.am
+++ b/thunar-vfs/Makefile.am
@@ -54,6 +54,8 @@ libthunar_vfs_1_la_SOURCES =						\
 	thunar-vfs-chown-job.c						\
 	thunar-vfs-chown-job.h						\
 	thunar-vfs-config.c						\
+	thunar-vfs-creat-job.c						\
+	thunar-vfs-creat-job.h						\
 	thunar-vfs-exec.c						\
 	thunar-vfs-exec.h						\
 	thunar-vfs-info.c						\
diff --git a/thunar-vfs/thunar-vfs-chmod-job.c b/thunar-vfs/thunar-vfs-chmod-job.c
index 7c27f8d1a0fd4ce91083a4aa8ed239bfd8dd9440..60eec75dafd1236e57911c24e02c331c2f839a39 100644
--- a/thunar-vfs/thunar-vfs-chmod-job.c
+++ b/thunar-vfs/thunar-vfs-chmod-job.c
@@ -207,6 +207,13 @@ thunar_vfs_chmod_job_execute (ThunarVfsJob *job)
       thunar_vfs_path_unref (lp->data);
     }
 
+  /* emit an error if some operation failed */
+  if (G_UNLIKELY (error != NULL))
+    {
+      thunar_vfs_job_error (job, error);
+      g_error_free (error);
+    }
+
   /* release the (remaining) path list */
   for (; lp != NULL; lp = lp->next)
     thunar_vfs_path_unref (lp->data);
diff --git a/thunar-vfs/thunar-vfs-chown-job.c b/thunar-vfs/thunar-vfs-chown-job.c
index 410f6e811ea2e16c265c1a6c47bd46597a50adc3..af54ee0bb75663acf704e5894f8a557a94c0518a 100644
--- a/thunar-vfs/thunar-vfs-chown-job.c
+++ b/thunar-vfs/thunar-vfs-chown-job.c
@@ -205,6 +205,13 @@ thunar_vfs_chown_job_execute (ThunarVfsJob *job)
       thunar_vfs_path_unref (lp->data);
     }
 
+  /* emit an error if some operation failed */
+  if (G_UNLIKELY (error != NULL))
+    {
+      thunar_vfs_job_error (job, error);
+      g_error_free (error);
+    }
+
   /* release the (remaining) path list */
   for (; lp != NULL; lp = lp->next)
     thunar_vfs_path_unref (lp->data);
diff --git a/thunar-vfs/thunar-vfs-creat-job.c b/thunar-vfs/thunar-vfs-creat-job.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a0227c81477696d75de2991e6990a5ad7118a06
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-creat-job.c
@@ -0,0 +1,284 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 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
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-creat-job.h>
+#include <thunar-vfs/thunar-vfs-monitor.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+
+
+static void thunar_vfs_creat_job_class_init (ThunarVfsCreatJobClass *klass);
+static void thunar_vfs_creat_job_init       (ThunarVfsCreatJob      *creat_job);
+static void thunar_vfs_creat_job_finalize   (GObject                *object);
+static void thunar_vfs_creat_job_execute    (ThunarVfsJob           *job);
+
+
+
+struct _ThunarVfsCreatJobClass
+{
+  ThunarVfsInteractiveJobClass __parent__;
+};
+
+struct _ThunarVfsCreatJob
+{
+  ThunarVfsInteractiveJob __parent__;
+
+  ThunarVfsMonitor *monitor;
+  GList            *path_list;
+};
+
+
+
+static GObjectClass *thunar_vfs_creat_job_parent_class;
+
+
+
+GType
+thunar_vfs_creat_job_get_type (void)
+{
+  static GType type = G_TYPE_INVALID;
+
+  if (G_UNLIKELY (type == G_TYPE_INVALID))
+    {
+      static const GTypeInfo info =
+      {
+        sizeof (ThunarVfsCreatJobClass),
+        NULL,
+        NULL,
+        (GClassInitFunc) thunar_vfs_creat_job_class_init,
+        NULL,
+        NULL,
+        sizeof (ThunarVfsCreatJob),
+        0,
+        (GInstanceInitFunc) thunar_vfs_creat_job_init,
+        NULL,
+      };
+
+      type = g_type_register_static (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
+                                     I_("ThunarVfsCreatJob"), &info, 0);
+    }
+
+  return type;
+}
+
+
+
+static void
+thunar_vfs_creat_job_class_init (ThunarVfsCreatJobClass *klass)
+{
+  ThunarVfsJobClass *thunarvfs_job_class;
+  GObjectClass      *gobject_class;
+
+  /* determine the parent type class */
+  thunar_vfs_creat_job_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = thunar_vfs_creat_job_finalize;
+
+  thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
+  thunarvfs_job_class->execute = thunar_vfs_creat_job_execute;
+}
+
+
+
+static void
+thunar_vfs_creat_job_init (ThunarVfsCreatJob *creat_job)
+{
+  /* grab a reference on the VFS monitor */
+  creat_job->monitor = thunar_vfs_monitor_get_default ();
+}
+
+
+
+static void
+thunar_vfs_creat_job_finalize (GObject *object)
+{
+  ThunarVfsCreatJob *creat_job = THUNAR_VFS_CREAT_JOB (object);
+
+  /* release our list of paths */
+  thunar_vfs_path_list_free (creat_job->path_list);
+
+  /* release the reference on the VFS monitor */
+  g_object_unref (G_OBJECT (creat_job->monitor));
+
+  (*G_OBJECT_CLASS (thunar_vfs_creat_job_parent_class)->finalize) (object);
+}
+
+
+
+static void
+thunar_vfs_creat_job_execute (ThunarVfsJob *job)
+{
+  ThunarVfsCreatJob *creat_job = THUNAR_VFS_CREAT_JOB (job);
+  gboolean           overwrite;
+  gboolean           skip;
+  gdouble            percentage;
+  gdouble            completed = 0.0;
+  GError            *error = NULL;
+  gchar              absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+  gchar             *display_name = NULL;
+  gchar             *message;
+  GList             *lp;
+  gint               flags;
+  gint               fd;
+
+  /* process all paths */
+  for (lp = creat_job->path_list; !thunar_vfs_job_cancelled (job) && lp != NULL; lp = lp->next)
+    {
+      /* determine the absolute path */
+      if (thunar_vfs_path_to_string (lp->data, absolute_path, sizeof (absolute_path), &error) < 0)
+        {
+          thunar_vfs_job_error (job, error);
+          g_error_free (error);
+          break;
+        }
+
+      /* release the previous display name (if any) */
+      g_free (display_name);
+
+      /* determine a display name for the path */
+      display_name = g_filename_display_name (absolute_path);
+
+      /* update the info message */
+      thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), display_name);
+
+      /* first attempt for the open flags */
+      flags = O_CREAT | O_EXCL | O_WRONLY;
+
+again:
+      /* try to create the file at the given path */
+      fd = open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0644);
+      if (G_UNLIKELY (fd < 0))
+        {
+          /* check if the file already exists */
+          if (G_UNLIKELY (errno == EEXIST))
+            {
+              /* ask the user whether to override this path */
+              message = g_strdup_printf (_("The file `%s' already exists. Do you want to replace it with an empty file?"), display_name);
+              overwrite = thunar_vfs_interactive_job_overwrite (THUNAR_VFS_INTERACTIVE_JOB (job), message);
+              g_free (message);
+
+              /* check if we should unlink the old file */
+              if (G_UNLIKELY (overwrite))
+                {
+                  /* try to unlink the file */
+                  if (unlink (absolute_path) < 0)
+                    {
+                      /* ask the user whether to skip this path */
+                      message = g_strdup_printf (_("Unable to remove `%s'.\n\nDo you want to skip it?"), display_name);
+                      skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (job), message);
+                      g_free (message);
+
+                      /* check if we should skip */
+                      if (G_UNLIKELY (!skip))
+                        break;
+                    }
+                  else
+                    {
+                      goto again;
+                    }
+                }
+            }
+          else
+            {
+              /* ask the user whether to skip this path */
+              message = g_strdup_printf (_("Failed to create empty file `%s'.\n\nDo you want to skip it?"), display_name);
+              skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (job), message);
+              g_free (message);
+
+              /* check if we should skip */
+              if (G_UNLIKELY (!skip))
+                break;
+            }
+        }
+      else
+        {
+          /* feed a change notification event */
+          thunar_vfs_monitor_feed (creat_job->monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, lp->data);
+
+          /* close the file */
+          close (fd);
+        }
+
+      /* we've just completed another item */
+      completed += 1;
+
+      /* update the percentage */
+      percentage = (completed * 100.0) / MAX (g_list_length (creat_job->path_list), 1);
+      thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (job), CLAMP (percentage, 0.0, 100.0));
+    }
+
+  /* emit the "new-files" signal with the given path list (if not empty) */
+  if (G_LIKELY (creat_job->path_list != NULL))
+    thunar_vfs_interactive_job_new_files (THUNAR_VFS_INTERACTIVE_JOB (job), creat_job->path_list);
+
+  /* cleanup */
+  g_free (display_name);
+}
+
+
+
+/**
+ * thunar_vfs_creat_job_new:
+ * @path_list : the list of #ThunarVfsPath<!---->s to create.
+ * @error     : return location for errors or %NULL.
+ *
+ * Allocates a new #ThunarVfsCreatJob to create new files at the
+ * locations contained in the @path_list.
+ *
+ * The caller is responsible to free the returned object using
+ * g_object_unref() when no longer needed.
+ *
+ * Return value: the newly allocated #ThunarVfsCreatJob or %NULL
+ *               on error.
+ **/
+ThunarVfsJob*
+thunar_vfs_creat_job_new (GList   *path_list,
+                          GError **error)
+{
+  ThunarVfsCreatJob *creat_job;
+
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /* allocate the new job */
+  creat_job = g_object_new (THUNAR_VFS_TYPE_CREAT_JOB, NULL);
+  creat_job->path_list = thunar_vfs_path_list_copy (path_list);
+
+  return THUNAR_VFS_JOB (creat_job);
+}
+
+
+
+#define __THUNAR_VFS_LINK_JOB_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-creat-job.h b/thunar-vfs/thunar-vfs-creat-job.h
new file mode 100644
index 0000000000000000000000000000000000000000..3c01a457b9ba6a3d2c3521c796180d41d0273c17
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-creat-job.h
@@ -0,0 +1,50 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 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
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __THUNAR_VFS_CREAT_JOB_H__
+#define __THUNAR_VFS_CREAT_JOB_H__
+
+#include <thunar-vfs/thunar-vfs-interactive-job.h>
+#include <thunar-vfs/thunar-vfs-path.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarVfsCreatJobClass ThunarVfsCreatJobClass;
+typedef struct _ThunarVfsCreatJob      ThunarVfsCreatJob;
+
+#define THUNAR_VFS_TYPE_CREAT_JOB             (thunar_vfs_creat_job_get_type ())
+#define THUNAR_VFS_CREAT_JOB(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_CREAT_JOB, ThunarVfsCreatJob))
+#define THUNAR_VFS_CREAT_JOB_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_CREAT_JOB, ThunarVfsCreatJobClass))
+#define THUNAR_VFS_IS_CREAT_JOB(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_CREAT_JOB))
+#define THUNAR_VFS_IS_CREAT_JOB_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_CREAT_JOB))
+#define THUNAR_VFS_CREAT_JOB_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_CREAT_JOB, ThunarVfsCreatJobClass))
+
+GType         thunar_vfs_creat_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+ThunarVfsJob *thunar_vfs_creat_job_new      (GList   *path_list,
+                                             GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_CREAT_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs.c b/thunar-vfs/thunar-vfs.c
index 07e9bb782f2fa3eb382a1cfe0b43cfb0344007db..d9442e5b7662b3e5347a40feb095c686cb6502bf 100644
--- a/thunar-vfs/thunar-vfs.c
+++ b/thunar-vfs/thunar-vfs.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
@@ -25,6 +25,7 @@
 #include <thunar-vfs/thunar-vfs.h>
 #include <thunar-vfs/thunar-vfs-chmod-job.h>
 #include <thunar-vfs/thunar-vfs-chown-job.h>
+#include <thunar-vfs/thunar-vfs-creat-job.h>
 #include <thunar-vfs/thunar-vfs-link-job.h>
 #include <thunar-vfs/thunar-vfs-listdir-job.h>
 #include <thunar-vfs/thunar-vfs-mkdir-job.h>
@@ -121,6 +122,78 @@ thunar_vfs_listdir (ThunarVfsPath *path,
 
 
 
+/**
+ * thunar_vfs_create_file:
+ * @path  : the #ThunarVfsPath of the file to create.
+ * @error : return location for errors or %NULL.
+ *
+ * Allocates a new #ThunarVfsCreateJob, which creates a new 
+ * file at @path.
+ *
+ * The caller is responsible to free the returned job using
+ * g_object_unref() when no longer needed.
+ *
+ * Note that the returned job is launched right away, so you
+ * don't need to call thunar_vfs_job_launch() on it.
+ *
+ * Return value: the newly allocated #ThunarVfsCreateJob or
+ *               %NULL if an error occurs while creating the job.
+ **/
+ThunarVfsJob*
+thunar_vfs_create_file (ThunarVfsPath *path,
+                        GError       **error)
+{
+  GList path_list;
+
+  g_return_val_if_fail (path != NULL, NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /* fake a path list */
+  path_list.data = path;
+  path_list.next = NULL;
+  path_list.prev = NULL;
+
+  /* allocate the job */
+  return thunar_vfs_create_files (&path_list, error);
+}
+
+
+
+/**
+ * thunar_vfs_create_files:
+ * @path_list : a list of #ThunarVfsPath<!---->s for files to create.
+ * @error     : return location for errors or %NULL.
+ *
+ * Allocates a new #ThunarVfsCreateJob, which creates new 
+ * files for all #ThunarVfsPath<!---->s in @path_list.
+ *
+ * The caller is responsible to free the returned job using
+ * g_object_unref() when no longer needed.
+ *
+ * Note that the returned job is launched right away, so you
+ * don't need to call thunar_vfs_job_launch() on it.
+ *
+ * Return value: the newly allocated #ThunarVfsCreateJob or
+ *               %NULL if an error occurs while creating the job.
+ **/
+ThunarVfsJob*
+thunar_vfs_create_files (GList   *path_list,
+                         GError **error)
+{
+  ThunarVfsJob *job;
+
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  /* allocate/launch the job */
+  job = thunar_vfs_creat_job_new (path_list, error);
+  if (G_LIKELY (job != NULL))
+    thunar_vfs_job_launch (job);
+
+  return job;
+}
+
+
+
 /**
  * thunar_vfs_copy_file:
  * @source_path : the source #ThunarVfsPath.
diff --git a/thunar-vfs/thunar-vfs.h b/thunar-vfs/thunar-vfs.h
index 919b7d7bdc46b4c3892738d0882233149ef8d508..4f5d2b55c43248b066bfe55b6525a0552e0bb494 100644
--- a/thunar-vfs/thunar-vfs.h
+++ b/thunar-vfs/thunar-vfs.h
@@ -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
@@ -47,6 +47,11 @@ void          thunar_vfs_shutdown         (void);
 ThunarVfsJob *thunar_vfs_listdir          (ThunarVfsPath    *path,
                                            GError          **error) G_GNUC_MALLOC;
 
+ThunarVfsJob *thunar_vfs_create_file      (ThunarVfsPath    *path,
+                                           GError          **error) G_GNUC_MALLOC;
+ThunarVfsJob *thunar_vfs_create_files     (GList            *path_list,
+                                           GError          **error) G_GNUC_MALLOC;
+
 ThunarVfsJob *thunar_vfs_copy_file        (ThunarVfsPath    *source_path,
                                            ThunarVfsPath    *target_path,
                                            GError          **error) G_GNUC_MALLOC;
diff --git a/thunar-vfs/thunar-vfs.symbols b/thunar-vfs/thunar-vfs.symbols
index 5a9d25e67b4ed74c81d5661f84a300cc11e422bb..65636155602c4dc40fa5d8f14ff5329da2381607 100644
--- a/thunar-vfs/thunar-vfs.symbols
+++ b/thunar-vfs/thunar-vfs.symbols
@@ -40,6 +40,8 @@
 thunar_vfs_init
 thunar_vfs_shutdown
 thunar_vfs_listdir G_GNUC_MALLOC
+thunar_vfs_create_file G_GNUC_MALLOC
+thunar_vfs_create_files G_GNUC_MALLOC
 thunar_vfs_copy_file G_GNUC_MALLOC
 thunar_vfs_copy_files G_GNUC_MALLOC
 thunar_vfs_link_file G_GNUC_MALLOC
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index ff3be64ad646dd51e047cc791a4c7572a5e599b9..a8db8397369a1065dfaa1f47ecafc6d108da9718 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -114,6 +114,8 @@ Thunar_SOURCES =							\
 	thunar-statusbar.h						\
 	thunar-stock.c							\
 	thunar-stock.h							\
+	thunar-templates-action.c					\
+	thunar-templates-action.h					\
 	thunar-text-renderer.c						\
 	thunar-text-renderer.h						\
 	thunar-thumbnail-frame.c					\
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 23c7a4e9d5126daef764cbe1255e0a620cf2b84c..e559d98b7fbbf57f0abf17b28a4a3766e5ea5208 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
- * Copyright (c) 2005 Jeff Franks <jcfranks@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005      Jeff Franks <jcfranks@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
@@ -413,6 +413,41 @@ thunar_application_open_window (ThunarApplication *application,
 
 
 
+/**
+ * thunar_application_copy_to:
+ * @application       : a #ThunarApplication.
+ * @widget            : the associated widget or %NULL.
+ * @source_path_list  : the list of #ThunarVfsPath<!---->s that should be copied.
+ * @target_path_list  : the list of #ThunarVfsPath<!---->s where files should be copied to.
+ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
+ *                      which will be emitted when the job finishes with the
+ *                      list of #ThunarVfsPath<!---->s created by the job, or
+ *                      %NULL if you're not interested in the signal.
+ *
+ * Copies all files from @source_path_list to their locations specified in
+ * @target_path_list.
+ *
+ * @source_path_list and @target_path_list must be of the same length. 
+ **/
+void
+thunar_application_copy_to (ThunarApplication *application,
+                            GtkWidget         *widget,
+                            GList             *source_path_list,
+                            GList             *target_path_list,
+                            GClosure          *new_files_closure)
+{
+  g_return_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list));
+  g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
+  g_return_if_fail (THUNAR_IS_APPLICATION (application));
+
+  /* launch the operation */
+  thunar_application_launch (application, widget, "stock_folder-copy",
+                             _("Copying files..."), thunar_vfs_copy_files,
+                             source_path_list, target_path_list, new_files_closure);
+}
+
+
+
 /**
  * thunar_application_copy_into:
  * @application       : a #ThunarApplication.
@@ -550,6 +585,46 @@ thunar_application_unlink (ThunarApplication *application,
 
 
 
+static ThunarVfsJob*
+creat_stub (GList   *source_path_list,
+            GList   *target_path_list,
+            GError **error)
+{
+  return thunar_vfs_create_files (source_path_list, error);
+}
+
+
+
+/**
+ * thunar_application_creat:
+ * @application       : a #ThunarApplication.
+ * @widget            : the associated #GtkWidget or %NULL.
+ * @path_list         : the list of files to create.
+ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
+ *                      which will be emitted when the job finishes with the
+ *                      list of #ThunarVfsPath<!---->s created by the job, or
+ *                      %NULL if you're not interested in the signal.
+ *
+ * Creates empty files for all #ThunarVfsPath<!---->s listed in @path_list. This
+ * method takes care of all user interaction.
+ **/
+void
+thunar_application_creat (ThunarApplication *application,
+                          GtkWidget         *widget,
+                          GList             *path_list,
+                          GClosure          *new_files_closure)
+{
+  g_return_if_fail (THUNAR_IS_APPLICATION (application));
+  g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
+
+  /* launch the operation */
+  thunar_application_launch (application, widget, "stock_new",
+                             _("Creating files..."), creat_stub,
+                             path_list, path_list, new_files_closure);
+}
+
+
+
 static ThunarVfsJob*
 mkdir_stub (GList   *source_path_list,
             GList   *target_path_list,
diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h
index 2ec909504ce933ffacf105326d77214a973f6f49..8345a34da2e5e0468bc5be692751c6ba0d437efe 100644
--- a/thunar/thunar-application.h
+++ b/thunar/thunar-application.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
- * Copyright (c) 2005 Jeff Franks <jcfranks@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005      Jeff Franks <jcfranks@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
@@ -45,6 +45,12 @@ void               thunar_application_open_window   (ThunarApplication *applicat
                                                      ThunarFile        *directory,
                                                      GdkScreen         *screen);
 
+void               thunar_application_copy_to       (ThunarApplication *application,
+                                                     GtkWidget         *widget,
+                                                     GList             *source_path_list,
+                                                     GList             *target_path_list,
+                                                     GClosure          *new_files_closure);
+
 void               thunar_application_copy_into     (ThunarApplication *application,
                                                      GtkWidget         *widget,
                                                      GList             *source_path_list,
@@ -67,6 +73,11 @@ void               thunar_application_unlink        (ThunarApplication *applicat
                                                      GtkWidget         *widget,
                                                      GList             *path_list);
 
+void               thunar_application_creat         (ThunarApplication *application,
+                                                     GtkWidget         *widget,
+                                                     GList             *path_list,
+                                                     GClosure          *new_files_closure);
+
 void               thunar_application_mkdir         (ThunarApplication *application,
                                                      GtkWidget         *widget,
                                                      GList             *path_list,
diff --git a/thunar/thunar-create-dialog.c b/thunar/thunar-create-dialog.c
index 5d4c3237f75f171068dc75306c02f72e44fc192c..aba1e728bceaba08c55e2145ac0e11867d9bc4b0 100644
--- a/thunar/thunar-create-dialog.c
+++ b/thunar/thunar-create-dialog.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <thunar/thunar-create-dialog.h>
+#include <thunar/thunar-dialogs.h>
 #include <thunar/thunar-icon-factory.h>
 
 
@@ -378,12 +379,33 @@ void
 thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
                                    const gchar        *filename)
 {
+  const gchar *dot;
+  glong        offset;
+
   g_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
   g_return_if_fail (filename != NULL);
       
   /* setup the new filename */
   gtk_entry_set_text (GTK_ENTRY (dialog->entry), filename);
 
+  /* check if filename contains a dot */
+  dot = g_utf8_strrchr (filename, -1, '.');
+  if (G_LIKELY (dot != NULL))
+    {
+      /* grab focus to the entry first, else
+       * the selection will be altered later
+       * when the focus is transferred.
+       */
+      gtk_widget_grab_focus (dialog->entry);
+
+      /* determine the UTF-8 char offset */
+      offset = g_utf8_pointer_to_offset (filename, dot);
+
+      /* select the text prior to the dot */
+      if (G_LIKELY (offset > 0))
+        gtk_entry_select_region (GTK_ENTRY (dialog->entry), 0, offset);
+    }
+
   /* notify listeners */
   g_object_notify (G_OBJECT (dialog), "filename");
 }
@@ -440,3 +462,74 @@ thunar_create_dialog_set_mime_info (ThunarCreateDialog *dialog,
   g_object_notify (G_OBJECT (dialog), "mime-info");
 }
 
+
+
+/**
+ * thunar_show_create_dialog:
+ * @parent    : the parent widget or %NULL.
+ * @mime_info : the #ThunarVfsMimeInfo of the file or folder to create.
+ * @filename  : the suggested filename or %NULL.
+ * @title     : the dialog title.
+ *
+ * Constructs and display a #ThunarCreateDialog with the specified
+ * parameters that asks the user to enter a name for a new file or
+ * folder.
+ *
+ * The caller is responsible to free the returned filename using
+ * g_free() when no longer needed.
+ *
+ * Return value: the filename entered by the user or %NULL if the user
+ *               cancelled the dialog.
+ **/
+gchar*
+thunar_show_create_dialog (GtkWidget         *parent,
+                           ThunarVfsMimeInfo *mime_info,
+                           const gchar       *filename,
+                           const gchar       *title)
+{
+  GtkWidget *dialog;
+  GtkWidget *window;
+  GError    *error = NULL;
+  gchar     *name = NULL;
+
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+
+  /* determine the toplevel window */
+  window = (parent != NULL) ? gtk_widget_get_toplevel (parent) : NULL;
+
+  /* display the create dialog */
+  dialog = g_object_new (THUNAR_TYPE_CREATE_DIALOG,
+                         "destroy-with-parent", TRUE,
+                         "filename", filename,
+                         "mime-info", mime_info,
+                         "modal", TRUE,
+                         "title", title,
+                         NULL);
+  if (G_LIKELY (window != NULL))
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      /* determine the chosen filename */
+      filename = thunar_create_dialog_get_filename (THUNAR_CREATE_DIALOG (dialog));
+
+      /* convert the UTF-8 filename to the local file system encoding */
+      name = g_filename_from_utf8 (filename, -1, NULL, NULL, &error);
+      if (G_UNLIKELY (name == NULL))
+        {
+          /* display an error message */
+          thunar_dialogs_show_error (dialog, error, _("Cannot convert filename `%s' to the local encoding"), filename);
+
+          /* release the error */
+          g_error_free (error);
+        }
+    }
+
+  /* destroy the dialog */
+  gtk_widget_destroy (dialog);
+
+  return name;
+}
+
+
+
+
diff --git a/thunar/thunar-create-dialog.h b/thunar/thunar-create-dialog.h
index bf71703dcf55d07812bffa7b6463400a17a68c6b..e8aca253ff2437dab988181a02e67d7e823fdf84 100644
--- a/thunar/thunar-create-dialog.h
+++ b/thunar/thunar-create-dialog.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
@@ -46,6 +46,11 @@ ThunarVfsMimeInfo *thunar_create_dialog_get_mime_info (const ThunarCreateDialog
 void               thunar_create_dialog_set_mime_info (ThunarCreateDialog       *dialog,
                                                        ThunarVfsMimeInfo        *mime_info);
 
+gchar             *thunar_show_create_dialog          (GtkWidget                *parent,
+                                                       ThunarVfsMimeInfo        *mime_info,
+                                                       const gchar              *filename,
+                                                       const gchar              *title) G_GNUC_MALLOC;
+
 G_END_DECLS;
 
 #endif /* !__THUNAR_CREATE_DIALOG_H__ */
diff --git a/thunar/thunar-pango-extensions.c b/thunar/thunar-pango-extensions.c
index 947498e97be0b19fc2fa2684517d27cf91a63d33..395341a631acf72aaf8dc07dc41f0805e82ce9f5 100644
--- a/thunar/thunar-pango-extensions.c
+++ b/thunar/thunar-pango-extensions.c
@@ -78,6 +78,26 @@ thunar_pango_attr_list_big (void)
 
 
 
+/**
+ * thunar_pango_attr_list_big_bold:
+ *
+ * Returns a #PangoAttrList for rendering big bold text.
+ * The returned list is owned by the callee and must
+ * not be freed or modified by the caller.
+ *
+ * Return value: a #PangoAttrList for rendering big bold text.
+ **/
+PangoAttrList*
+thunar_pango_attr_list_big_bold (void)
+{
+  static PangoAttrList *attr_list = NULL;
+  if (G_UNLIKELY (attr_list == NULL))
+    attr_list = thunar_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE), pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
+  return attr_list;
+}
+
+
+
 /**
  * thunar_pango_attr_list_bold:
  *
diff --git a/thunar/thunar-pango-extensions.h b/thunar/thunar-pango-extensions.h
index b1b38adae4908abef28dea8522ef881d047f06d4..4c4942b5c6b2f45879a53bdf4f35e70bbcd67c37 100644
--- a/thunar/thunar-pango-extensions.h
+++ b/thunar/thunar-pango-extensions.h
@@ -25,6 +25,7 @@
 G_BEGIN_DECLS;
 
 PangoAttrList *thunar_pango_attr_list_big           (void) G_GNUC_CONST G_GNUC_INTERNAL;
+PangoAttrList *thunar_pango_attr_list_big_bold      (void) G_GNUC_CONST G_GNUC_INTERNAL;
 PangoAttrList *thunar_pango_attr_list_bold          (void) G_GNUC_CONST G_GNUC_INTERNAL;
 PangoAttrList *thunar_pango_attr_list_italic        (void) G_GNUC_CONST G_GNUC_INTERNAL;
 PangoAttrList *thunar_pango_attr_list_small_italic  (void) G_GNUC_CONST G_GNUC_INTERNAL;
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 57435c523f6c5eaf8e1589dc7fc833656556d807..ee297085e436605e5f149cc9fb474747fb00fdd3 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -588,7 +588,7 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
 
       label = gtk_label_new (_("Apply recursively?"));
       gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
-      gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big ());
+      gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big_bold ());
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
       gtk_widget_show (label);
 
diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c
index 6df8562874bd53cbb36f5a768d8800cf5107207b..bf0cd87ff217b3bb2b1d6bc2060efda48f2672cc 100644
--- a/thunar/thunar-preferences.c
+++ b/thunar/thunar-preferences.c
@@ -54,9 +54,12 @@ enum
   PROP_LAST_LOCATION_BAR,
   PROP_LAST_SIDE_PANE,
   PROP_LAST_VIEW,
+  PROP_LAST_WINDOW_HEIGHT,
+  PROP_LAST_WINDOW_WIDTH,
   PROP_MISC_FOLDERS_FIRST,
   PROP_MISC_HORIZONTAL_WHEEL_NAVIGATES,
   PROP_MISC_RECURSIVE_PERMISSIONS,
+  PROP_MISC_SHOW_ABOUT_TEMPLATES,
   PROP_MISC_SHOW_THUMBNAILS,
   PROP_MISC_TEXT_BESIDE_ICONS,
   PROP_SHORTCUTS_ICON_EMBLEMS,
@@ -237,6 +240,34 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
                                                         "ThunarIconView",
                                                         EXO_PARAM_READWRITE));
 
+  /**
+   * ThunarPreferences:last-window-height:
+   *
+   * The last known height of a #ThunarWindow, which will be used as
+   * default height for newly created windows.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_LAST_WINDOW_HEIGHT,
+                                   g_param_spec_int ("last-window-height",
+                                                     "last-window-height",
+                                                     "last-window-height",
+                                                     1, G_MAXINT, 480,
+                                                     EXO_PARAM_READWRITE));
+
+  /**
+   * ThunarPreferences:last-window-width:
+   *
+   * The last known width of a #ThunarWindow, which will be used as
+   * default width for newly created windows.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_LAST_WINDOW_WIDTH,
+                                   g_param_spec_int ("last-window-width",
+                                                     "last-window-width",
+                                                     "last-window-width",
+                                                     1, G_MAXINT, 640,
+                                                     EXO_PARAM_READWRITE));
+
   /**
    * ThunarPreferences:misc-folders-first:
    *
@@ -279,6 +310,20 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
                                                       THUNAR_RECURSIVE_PERMISSIONS_ASK,
                                                       EXO_PARAM_READWRITE));
 
+  /**
+   * ThunarPreferences:misc-show-about-templates:
+   *
+   * Whether to display the "About Templates" dialog, when opening the
+   * Templates folder from the Go menu.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_MISC_SHOW_ABOUT_TEMPLATES,
+                                   g_param_spec_boolean ("misc-show-about-templates",
+                                                         "misc-show-about-templates",
+                                                         "misc-show-about-templates",
+                                                         TRUE,
+                                                         EXO_PARAM_READWRITE));
+
   /**
    * ThunarPreferences:misc-show-thumbnails:
    *
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index f15b4ec2b04e66812ea3ed20e2d81ed5753cee53..ee879828a8d8e3db0f60e5c94160dc959d2d37d4 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <thunar/thunar-application.h>
 #include <thunar/thunar-dialogs.h>
 #include <thunar/thunar-shortcuts-icon-renderer.h>
 #include <thunar/thunar-shortcuts-model.h>
@@ -89,11 +90,11 @@ static GtkTreePath *thunar_shortcuts_view_compute_drop_position  (ThunarShortcut
 static void         thunar_shortcuts_view_drop_uri_list          (ThunarShortcutsView      *view,
                                                                   const gchar              *uri_list,
                                                                   GtkTreePath              *dst_path);
-#if GTK_CHECK_VERSION(2,6,0)
+static void         thunar_shortcuts_view_open                   (ThunarShortcutsView      *view);
+static void         thunar_shortcuts_view_open_in_new_window     (ThunarShortcutsView      *view);
 static gboolean     thunar_shortcuts_view_separator_func         (GtkTreeModel             *model,
                                                                   GtkTreeIter              *iter,
                                                                   gpointer                  user_data);
-#endif
 
 
 
@@ -265,9 +266,8 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
                      drop_targets, G_N_ELEMENTS (drop_targets),
                      GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE);
 
-#if GTK_CHECK_VERSION(2,6,0)
+  /* setup a row separator function to tell GtkTreeView about the separator */
   gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (view), thunar_shortcuts_view_separator_func, NULL, NULL);
-#endif
 }
 
 
@@ -316,7 +316,13 @@ thunar_shortcuts_view_button_press_event (GtkWidget      *widget,
 
   /* check if we have a right-click event */
   if (G_LIKELY (event->button != 3))
-    return result;
+    {
+      /* we open a new window for double-middle-clicks */
+      if (G_UNLIKELY (event->type == GDK_2BUTTON_PRESS && event->button == 2))
+        thunar_shortcuts_view_open_in_new_window (view);
+
+      return result;
+    }
 
   /* resolve the path at the cursor position */
   if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), event->x, event->y, &path, NULL, NULL, NULL))
@@ -344,7 +350,29 @@ thunar_shortcuts_view_button_press_event (GtkWidget      *widget,
       g_signal_connect_swapped (G_OBJECT (menu), "deactivate", G_CALLBACK (g_main_loop_quit), loop);
       exo_gtk_object_ref_sink (GTK_OBJECT (menu));
 
-      /* prepend the custom actions for the selected file (if any) */
+      /* append the "Open" menu action */
+      item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
+      g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_open), widget);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+
+      /* set the stock icon */
+      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      gtk_widget_show (image);
+
+      /* append the "Open in New Window" menu action */
+      item = gtk_image_menu_item_new_with_mnemonic (_("Open in New Window"));
+      g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_open_in_new_window), widget);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+
+      /* append a menu separator */
+      item = gtk_separator_menu_item_new ();
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+
+      /* append the custom actions for the selected file (if any) */
       if (G_LIKELY (file != NULL))
         {
           /* determine the toplevel window */
@@ -551,26 +579,12 @@ thunar_shortcuts_view_row_activated (GtkTreeView       *tree_view,
                                      GtkTreePath       *path,
                                      GtkTreeViewColumn *column)
 {
-  ThunarShortcutsView *view = THUNAR_SHORTCUTS_VIEW (tree_view);
-  GtkTreeModel         *model;
-  GtkTreeIter           iter;
-  ThunarFile           *file;
-
-  g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
-  g_return_if_fail (path != NULL);
-
-  /* determine the iter for the path */
-  model = gtk_tree_view_get_model (tree_view);
-  gtk_tree_model_get_iter (model, &iter, path);
-
-  /* determine the file for the shortcut and invoke the signal */
-  file = thunar_shortcuts_model_file_for_iter (THUNAR_SHORTCUTS_MODEL (model), &iter);
-  if (G_LIKELY (file != NULL))
-    g_signal_emit (G_OBJECT (view), view_signals[SHORTCUT_ACTIVATED], 0, file);
-
   /* call the row-activated method in the parent class */
   if (GTK_TREE_VIEW_CLASS (thunar_shortcuts_view_parent_class)->row_activated != NULL)
     (*GTK_TREE_VIEW_CLASS (thunar_shortcuts_view_parent_class)->row_activated) (tree_view, path, column);
+
+  /* open the folder referenced by the shortcut */
+  thunar_shortcuts_view_open (THUNAR_SHORTCUTS_VIEW (tree_view));
 }
 
 
@@ -754,7 +768,63 @@ thunar_shortcuts_view_drop_uri_list (ThunarShortcutsView *view,
 
 
 
-#if GTK_CHECK_VERSION(2,6,0)
+static void
+thunar_shortcuts_view_open (ThunarShortcutsView *view)
+{
+  GtkTreeSelection *selection;
+  GtkTreeModel     *model;
+  GtkTreeIter       iter;
+  ThunarFile       *file;
+
+  g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+
+  /* determine the selected item */
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    {
+      /* determine the file for the shortcut at the given tree iterator */
+      gtk_tree_model_get (model, &iter, THUNAR_SHORTCUTS_MODEL_COLUMN_FILE, &file, -1);
+      if (G_LIKELY (file != NULL))
+        {
+          /* invoke the signal to change to that folder */
+          g_signal_emit (G_OBJECT (view), view_signals[SHORTCUT_ACTIVATED], 0, file);
+          g_object_unref (G_OBJECT (file));
+        }
+    }
+}
+
+
+
+static void
+thunar_shortcuts_view_open_in_new_window (ThunarShortcutsView *view)
+{
+  ThunarApplication *application;
+  GtkTreeSelection  *selection;
+  GtkTreeModel      *model;
+  GtkTreeIter        iter;
+  ThunarFile        *file;
+
+  g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+
+  /* determine the selected item */
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    {
+      /* determine the file for the shortcut at the given tree iterator */
+      gtk_tree_model_get (model, &iter, THUNAR_SHORTCUTS_MODEL_COLUMN_FILE, &file, -1);
+      if (G_LIKELY (file != NULL))
+        {
+          /* open a new window for the shortcut target folder */
+          application = thunar_application_get ();
+          thunar_application_open_window (application, file, gtk_widget_get_screen (GTK_WIDGET (view)));
+          g_object_unref (G_OBJECT (application));
+          g_object_unref (G_OBJECT (file));
+        }
+    }
+}
+
+
+
 static gboolean
 thunar_shortcuts_view_separator_func (GtkTreeModel *model,
                                       GtkTreeIter  *iter,
@@ -764,7 +834,6 @@ thunar_shortcuts_view_separator_func (GtkTreeModel *model,
   gtk_tree_model_get (model, iter, THUNAR_SHORTCUTS_MODEL_COLUMN_SEPARATOR, &separator, -1);
   return separator;
 }
-#endif
 
 
 
diff --git a/thunar/thunar-standard-view-ui.xml b/thunar/thunar-standard-view-ui.xml
index f7a2031f0ed56734695b61401f399ebf7d972e53..b934f75cbcd1ab614aa239eaec75cdb9937e0cee 100644
--- a/thunar/thunar-standard-view-ui.xml
+++ b/thunar/thunar-standard-view-ui.xml
@@ -14,6 +14,7 @@
     <menu action="file-menu" name="file-menu">
       <placeholder name="placeholder-create-actions">
         <menuitem action="create-folder" name="create-folder" />
+        <menuitem action="create-document" name="create-document" />
       </placeholder>
       <placeholder name="placeholder-launcher-actions">
         <menuitem action="open" name="open" />
@@ -63,6 +64,7 @@
 
   <popup action="folder-context-menu" name="folder-context-menu">
     <menuitem action="create-folder" name="create-folder" />
+    <menuitem action="create-document" name="create-document" />
     <separator />
     <placeholder name="placeholder-view-items-actions" />
     <separator />
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 75cc29e92a837274d897d353ade9a2efbf103c82..a5b2075261a62b9cce29cd1ab10c47938c3a467b 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -40,6 +40,7 @@
 #include <thunar/thunar-properties-dialog.h>
 #include <thunar/thunar-standard-view.h>
 #include <thunar/thunar-standard-view-ui.h>
+#include <thunar/thunar-templates-action.h>
 #include <thunar/thunar-text-renderer.h>
 
 
@@ -124,8 +125,13 @@ static GList        *thunar_standard_view_get_selected_paths        (ThunarStand
 static void          thunar_standard_view_merge_custom_actions      (ThunarStandardView       *standard_view,
                                                                      GList                    *selected_items);
 static void          thunar_standard_view_update_statusbar_text     (ThunarStandardView       *standard_view);
+static void          thunar_standard_view_action_create_empty_file  (GtkAction                *action,
+                                                                     ThunarStandardView       *standard_view);
 static void          thunar_standard_view_action_create_folder      (GtkAction                *action,
                                                                      ThunarStandardView       *standard_view);
+static void          thunar_standard_view_action_create_template    (GtkAction                *action,
+                                                                     const ThunarVfsInfo      *info,
+                                                                     ThunarStandardView       *standard_view);
 static void          thunar_standard_view_action_properties         (GtkAction                *action,
                                                                      ThunarStandardView       *standard_view);
 static void          thunar_standard_view_action_copy               (GtkAction                *action,
@@ -434,6 +440,8 @@ thunar_standard_view_view_init (ThunarViewIface *iface)
 static void
 thunar_standard_view_init (ThunarStandardView *standard_view)
 {
+  GtkAction *action;
+
   standard_view->priv = THUNAR_STANDARD_VIEW_GET_PRIVATE (standard_view);
   standard_view->priv->drag_timer_id = -1;
 
@@ -472,6 +480,13 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
   standard_view->priv->action_make_link = gtk_action_group_get_action (standard_view->action_group, "make-link");
   standard_view->priv->action_rename = gtk_action_group_get_action (standard_view->action_group, "rename");
 
+  /* add the "Create Document" sub menu action */
+  action = thunar_templates_action_new ("create-document", _("Create _Document"));
+  g_signal_connect (G_OBJECT (action), "create-empty-file", G_CALLBACK (thunar_standard_view_action_create_empty_file), standard_view);
+  g_signal_connect (G_OBJECT (action), "create-template", G_CALLBACK (thunar_standard_view_action_create_template), standard_view);
+  gtk_action_group_add_action (standard_view->action_group, action);
+  g_object_unref (G_OBJECT (action));
+
   /* setup the list model */
   standard_view->model = thunar_list_model_new ();
   g_signal_connect (G_OBJECT (standard_view->model), "error", G_CALLBACK (thunar_standard_view_error), standard_view);
@@ -1337,6 +1352,57 @@ thunar_standard_view_update_statusbar_text (ThunarStandardView *standard_view)
 
 
 
+static void
+thunar_standard_view_action_create_empty_file (GtkAction          *action,
+                                               ThunarStandardView *standard_view)
+{
+  ThunarVfsMimeDatabase *mime_database;
+  ThunarVfsMimeInfo     *mime_info;
+  ThunarApplication     *application;
+  ThunarFile            *current_directory;
+  GList                  path_list;
+  gchar                 *name;
+
+  g_return_if_fail (GTK_IS_ACTION (action));
+  g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+
+  /* lookup "text/plain" mime info */
+  mime_database = thunar_vfs_mime_database_get_default ();
+  mime_info = thunar_vfs_mime_database_get_info (mime_database, "text/plain");
+
+  /* ask the user to enter a name for the new empty file */
+  name = thunar_show_create_dialog (GTK_WIDGET (standard_view), mime_info, _("New Empty File"), _("New Empty File..."));
+  if (G_LIKELY (name != NULL))
+    {
+      /* determine the ThunarFile for the current directory */
+      current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
+      if (G_LIKELY (current_directory != NULL))
+        {
+          /* fake the path list */
+          path_list.data = thunar_vfs_path_relative (thunar_file_get_path (current_directory), name);
+          path_list.next = path_list.prev = NULL;
+
+          /* launch the operation */
+          application = thunar_application_get ();
+          thunar_application_creat (application, GTK_WIDGET (standard_view), &path_list,
+                                    thunar_standard_view_new_files_closure (standard_view));
+          g_object_unref (G_OBJECT (application));
+
+          /* release the path */
+          thunar_vfs_path_unref (path_list.data);
+        }
+
+      /* release the file name in the local encoding */
+      g_free (name);
+    }
+
+  /* cleanup */
+  g_object_unref (G_OBJECT (mime_database));
+  thunar_vfs_mime_info_unref (mime_info);
+}
+
+
+
 static void
 thunar_standard_view_action_create_folder (GtkAction          *action,
                                            ThunarStandardView *standard_view)
@@ -1344,11 +1410,7 @@ thunar_standard_view_action_create_folder (GtkAction          *action,
   ThunarVfsMimeDatabase *mime_database;
   ThunarVfsMimeInfo     *mime_info;
   ThunarApplication     *application;
-  const gchar           *filename;
   ThunarFile            *current_directory;
-  GtkWidget             *dialog;
-  GtkWidget             *window;
-  GError                *error = NULL;
   GList                  path_list;
   gchar                 *name;
 
@@ -1359,59 +1421,31 @@ thunar_standard_view_action_create_folder (GtkAction          *action,
   mime_database = thunar_vfs_mime_database_get_default ();
   mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/directory");
 
-  /* determine the toplevel window */
-  window = gtk_widget_get_toplevel (GTK_WIDGET (standard_view));
-
-  /* display the create dialog */
-  dialog = g_object_new (THUNAR_TYPE_CREATE_DIALOG,
-                         "destroy-with-parent", TRUE,
-                         "filename", _("New Folder"),
-                         "mime-info", mime_info,
-                         "modal", TRUE,
-                         "title", _("New Folder..."),
-                         NULL);
-  if (G_LIKELY (window != NULL))
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+  /* ask the user to enter a name for the new folder */
+  name = thunar_show_create_dialog (GTK_WIDGET (standard_view), mime_info, _("New Folder"), _("New Folder..."));
+  if (G_LIKELY (name != NULL))
     {
-      /* determine the chosen filename */
-      filename = thunar_create_dialog_get_filename (THUNAR_CREATE_DIALOG (dialog));
-
-      /* convert the UTF-8 filename to the local file system encoding */
-      name = g_filename_from_utf8 (filename, -1, NULL, NULL, &error);
-      if (G_UNLIKELY (name == NULL))
+      /* determine the ThunarFile for the current directory */
+      current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
+      if (G_LIKELY (current_directory != NULL))
         {
-          /* display an error message */
-          thunar_dialogs_show_error (dialog, error, _("Cannot convert filename `%s' to the local encoding"), filename);
-
-          /* release the error */
-          g_error_free (error);
+          /* fake the path list */
+          path_list.data = thunar_vfs_path_relative (thunar_file_get_path (current_directory), name);
+          path_list.next = path_list.prev = NULL;
+
+          /* launch the operation */
+          application = thunar_application_get ();
+          thunar_application_mkdir (application, GTK_WIDGET (standard_view), &path_list,
+                                    thunar_standard_view_new_files_closure (standard_view));
+          g_object_unref (G_OBJECT (application));
+
+          /* release the path */
+          thunar_vfs_path_unref (path_list.data);
         }
-      else
-        {
-          /* determine the ThunarFile for the current directory */
-          current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
-          if (G_LIKELY (current_directory != NULL))
-            {
-              /* fake the path list */
-              path_list.data = thunar_vfs_path_relative (thunar_file_get_path (current_directory), name);
-              path_list.next = path_list.prev = NULL;
-
-              /* launch the operation */
-              application = thunar_application_get ();
-              thunar_application_mkdir (application, GTK_WIDGET (standard_view), &path_list,
-                                        thunar_standard_view_new_files_closure (standard_view));
-              g_object_unref (G_OBJECT (application));
-
-              /* release the path */
-              thunar_vfs_path_unref (path_list.data);
-            }
 
-          /* release the file name in the local encoding */
-          g_free (name);
-        }
+      /* release the file name */
+      g_free (name);
     }
-  gtk_widget_destroy (dialog);
 
   /* cleanup */
   g_object_unref (G_OBJECT (mime_database));
@@ -1420,6 +1454,63 @@ thunar_standard_view_action_create_folder (GtkAction          *action,
 
 
 
+static void
+thunar_standard_view_action_create_template (GtkAction           *action,
+                                             const ThunarVfsInfo *info,
+                                             ThunarStandardView  *standard_view)
+{
+  ThunarApplication *application;
+  ThunarFile        *current_directory;
+  GList              source_path_list;
+  GList              target_path_list;
+  gchar             *title;
+  gchar             *name;
+
+  g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+  g_return_if_fail (GTK_IS_ACTION (action));
+  g_return_if_fail (info != NULL);
+
+  /* generate a title for the create dialog */
+  title = g_strdup_printf (_("Create Document from template \"%s\""), info->display_name);
+
+  /* ask the user to enter a name for the new document */
+  name = thunar_show_create_dialog (GTK_WIDGET (standard_view), info->mime_info, info->display_name, title);
+  if (G_LIKELY (name != NULL))
+    {
+      /* determine the ThunarFile for the current directory */
+      current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
+      if (G_LIKELY (current_directory != NULL))
+        {
+          /* fake the source path list */
+          source_path_list.data = info->path;
+          source_path_list.next = NULL;
+          source_path_list.prev = NULL;
+
+          /* fake the target path list */
+          target_path_list.data = thunar_vfs_path_relative (thunar_file_get_path (current_directory), name);
+          target_path_list.next = NULL;
+          target_path_list.prev = NULL;
+
+          /* launch the operation */
+          application = thunar_application_get ();
+          thunar_application_copy_to (application, GTK_WIDGET (standard_view), &source_path_list, &target_path_list,
+                                      thunar_standard_view_new_files_closure (standard_view));
+          g_object_unref (G_OBJECT (application));
+
+          /* release the target path */
+          thunar_vfs_path_unref (target_path_list.data);
+        }
+
+      /* release the file name */
+      g_free (name);
+    }
+
+  /* cleanup */
+  g_free (title);
+}
+
+
+
 static void
 thunar_standard_view_action_properties (GtkAction          *action,
                                         ThunarStandardView *standard_view)
diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
index 621b8955a713215c7b6f7bdb7649d87a23d55971..ee936230e5f4d511ace8515d707aaed5f3f0fc4b 100644
--- a/thunar/thunar-stock.c
+++ b/thunar/thunar-stock.c
@@ -34,9 +34,11 @@
 
 
 
+/* keep in sync with thunar-stock.h */
 static const gchar *thunar_stock_icons[] =
 {
   THUNAR_STOCK_GROUP,
+  THUNAR_STOCK_TEMPLATES,
   THUNAR_STOCK_USER,
 };
 
diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
index ee3975d449cac7f102245abeddc55d0b92bfae4a..6754fc46b07ee31562931cdc528331cb234c6c5c 100644
--- a/thunar/thunar-stock.h
+++ b/thunar/thunar-stock.h
@@ -23,8 +23,9 @@
 G_BEGIN_DECLS;
 
 /* stock icons for the ThunarPermissionsChooser */
-#define THUNAR_STOCK_GROUP  "thunar-group"
-#define THUNAR_STOCK_USER   "thunar-user"
+#define THUNAR_STOCK_GROUP      "thunar-group"
+#define THUNAR_STOCK_TEMPLATES  "thunar-templates"
+#define THUNAR_STOCK_USER       "thunar-user"
 
 void thunar_stock_init (void) G_GNUC_INTERNAL;
 
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
new file mode 100644
index 0000000000000000000000000000000000000000..dcb9e26c9d9be4ecb477d751055517171efc4913
--- /dev/null
+++ b/thunar/thunar-templates-action.c
@@ -0,0 +1,461 @@
+/* $Id$ */
+/*-
+ * 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
+ * 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
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs.h>
+
+#include <thunar/thunar-templates-action.h>
+
+
+
+/* Signal identifiers */
+enum
+{
+  CREATE_EMPTY_FILE,
+  CREATE_TEMPLATE,
+  LAST_SIGNAL,
+};
+
+
+
+static void       thunar_templates_action_class_init        (ThunarTemplatesActionClass *klass);
+static void       thunar_templates_action_init              (ThunarTemplatesAction      *templates_action);
+static void       thunar_templates_action_finalize          (GObject                    *object);
+static GtkWidget *thunar_templates_action_create_menu_item  (GtkAction                  *action);
+static void       thunar_templates_action_build_menu        (ThunarTemplatesAction      *templates_action,
+                                                             GtkWidget                  *menu);
+static void       thunar_templates_action_menu_mapped       (GtkWidget                  *menu,
+                                                             ThunarTemplatesAction      *templates_action);
+static void       thunar_templates_action_monitor           (ThunarVfsMonitor           *monitor,
+                                                             ThunarVfsMonitorHandle     *handle,
+                                                             ThunarVfsMonitorEvent       event,
+                                                             ThunarVfsPath              *handle_path,
+                                                             ThunarVfsPath              *event_path,
+                                                             gpointer                    user_data);
+
+
+
+struct _ThunarTemplatesActionClass
+{
+  GtkActionClass __parent__;
+
+  void (*create_empty_file) (ThunarTemplatesAction *templates_action);
+  void (*create_template)   (ThunarTemplatesAction *templates_action,
+                             const ThunarVfsInfo   *info);
+};
+
+struct _ThunarTemplatesAction
+{
+  GtkAction __parent__;
+
+  ThunarVfsMonitorHandle *templates_handle;
+  ThunarVfsMonitor       *templates_monitor;
+  ThunarVfsPath          *templates_path;
+};
+
+
+
+static GObjectClass *thunar_templates_action_parent_class;
+static guint         templates_action_signals[LAST_SIGNAL];
+
+
+
+GType
+thunar_templates_action_get_type (void)
+{
+  static GType type = G_TYPE_INVALID;
+
+  if (G_UNLIKELY (type == G_TYPE_INVALID))
+    {
+      static const GTypeInfo info =
+      {
+        sizeof (ThunarTemplatesActionClass),
+        NULL,
+        NULL,
+        (GClassInitFunc) thunar_templates_action_class_init,
+        NULL,
+        NULL,
+        sizeof (ThunarTemplatesAction),
+        0,
+        (GInstanceInitFunc) thunar_templates_action_init,
+        NULL,
+      };
+
+      type = g_type_register_static (GTK_TYPE_ACTION, I_("ThunarTemplatesAction"), &info, 0);
+    }
+
+  return type;
+}
+
+
+
+static void
+thunar_templates_action_class_init (ThunarTemplatesActionClass *klass)
+{
+  GtkActionClass *gtkaction_class;
+  GObjectClass   *gobject_class;
+
+  /* determine the parent type class */
+  thunar_templates_action_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = thunar_templates_action_finalize;
+
+  gtkaction_class = GTK_ACTION_CLASS (klass);
+  gtkaction_class->create_menu_item = thunar_templates_action_create_menu_item;
+
+  /**
+   * ThunarTemplatesAction::create-empty-file:
+   * @templates_action : a #ThunarTemplatesAction.
+   *
+   * Emitted by @templates_action whenever the user requests to
+   * create a new empty file.
+   **/
+  templates_action_signals[CREATE_EMPTY_FILE] =
+    g_signal_new (I_("create-empty-file"),
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (ThunarTemplatesActionClass, create_empty_file),
+                  NULL, NULL, g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * ThunarTemplatesAction::create-template:
+   * @templates_action : a #ThunarTemplatesAction.
+   * @info             : the #ThunarVfsInfo of the template file.
+   *
+   * Emitted by @templates_action whenever the user requests to
+   * create a new file based on the template referred to by
+   * @info.
+   **/
+  templates_action_signals[CREATE_TEMPLATE] =
+    g_signal_new (I_("create-template"),
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (ThunarTemplatesActionClass, create_template),
+                  NULL, NULL, g_cclosure_marshal_VOID__BOXED,
+                  G_TYPE_NONE, 1, THUNAR_VFS_TYPE_INFO);
+}
+
+
+
+static void
+thunar_templates_action_init (ThunarTemplatesAction *templates_action)
+{
+  ThunarVfsPath *home_path;
+
+  /* determine the path to the ~/Templates directory */
+  home_path = thunar_vfs_path_get_for_home ();
+  templates_action->templates_path = thunar_vfs_path_relative (home_path, "Templates");
+  thunar_vfs_path_unref (home_path);
+}
+
+
+
+static void
+thunar_templates_action_finalize (GObject *object)
+{
+  ThunarTemplatesAction *templates_action = THUNAR_TEMPLATES_ACTION (object);
+
+  /* unregister from the monitor (if any) */
+  if (G_LIKELY (templates_action->templates_monitor != NULL))
+    {
+      thunar_vfs_monitor_remove (templates_action->templates_monitor, templates_action->templates_handle);
+      g_object_unref (G_OBJECT (templates_action->templates_monitor));
+    }
+
+  /* release the ~/Templates path */
+  thunar_vfs_path_unref (templates_action->templates_path);
+
+  (*G_OBJECT_CLASS (thunar_templates_action_parent_class)->finalize) (object);
+}
+
+
+
+static GtkWidget*
+thunar_templates_action_create_menu_item (GtkAction *action)
+{
+  GtkWidget *item;
+  GtkWidget *menu;
+
+  g_return_val_if_fail (THUNAR_IS_TEMPLATES_ACTION (action), NULL);
+
+  /* let GtkAction allocate the menu item */
+  item = (*GTK_ACTION_CLASS (thunar_templates_action_parent_class)->create_menu_item) (action);
+
+  /* associate an empty submenu with the item (will be filled when mapped) */
+  menu = gtk_menu_new ();
+  g_signal_connect (G_OBJECT (menu), "map", G_CALLBACK (thunar_templates_action_menu_mapped), action);
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
+
+  return item;
+}
+
+
+
+static gint
+info_compare (gconstpointer info_a,
+              gconstpointer info_b)
+{
+  gchar *name_a;
+  gchar *name_b;
+  gint   result;
+
+  name_a = g_utf8_casefold (((ThunarVfsInfo *) info_a)->display_name, -1);
+  name_b = g_utf8_casefold (((ThunarVfsInfo *) info_b)->display_name, -1);
+  result = g_utf8_collate (name_a, name_b);
+  g_free (name_b);
+  g_free (name_a);
+
+  return result;
+}
+
+
+
+static void
+item_activated (GtkWidget             *item,
+                ThunarTemplatesAction *templates_action)
+{
+  const ThunarVfsInfo *info;
+
+  g_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
+  g_return_if_fail (GTK_IS_WIDGET (item));
+
+  /* check if an info is set for the item (else it's the "Empty File" item) */
+  info = g_object_get_data (G_OBJECT (item), I_("thunar-vfs-info"));
+  if (G_UNLIKELY (info != NULL))
+    g_signal_emit (G_OBJECT (templates_action), templates_action_signals[CREATE_TEMPLATE], 0, info);
+  else
+    g_signal_emit (G_OBJECT (templates_action), templates_action_signals[CREATE_EMPTY_FILE], 0);
+}
+
+
+
+static void
+thunar_templates_action_build_menu (ThunarTemplatesAction *templates_action,
+                                    GtkWidget             *menu)
+{
+  ThunarVfsInfo *info;
+  ThunarVfsPath *path;
+  GtkIconTheme  *icon_theme;
+  const gchar   *icon_name;
+  const gchar   *name;
+  GtkWidget     *image;
+  GtkWidget     *item;
+  gchar         *absolute_path;
+  gchar         *label;
+  gchar         *dot;
+  GList         *info_list = NULL;
+  GList         *lp;
+  GDir          *dp;
+
+  /* try to open the ~/Templates directory */
+  absolute_path = thunar_vfs_path_dup_string (templates_action->templates_path);
+  dp = g_dir_open (absolute_path, 0, NULL);
+  g_free (absolute_path);
+
+  /* read the directory contents (if opened successfully) */
+  if (G_LIKELY (dp != NULL))
+    {
+      /* process all files within the directory */
+      for (;;)
+        {
+          /* read the name of the next file */
+          name = g_dir_read_name (dp);
+          if (G_UNLIKELY (name == NULL))
+            break;
+          else if (name[0] == '.')
+            continue;
+
+          /* determine the info for that file */
+          path = thunar_vfs_path_relative (templates_action->templates_path, name);
+          info = thunar_vfs_info_new_for_path (path, NULL);
+          thunar_vfs_path_unref (path);
+
+          /* add the info (if any) to our list */
+          if (G_LIKELY (info != NULL))
+            info_list = g_list_insert_sorted (info_list, info, info_compare);
+        }
+
+      /* close the directory handle */
+      g_dir_close (dp);
+    }
+
+  /* check if we have any infos */
+  if (G_LIKELY (info_list != NULL))
+    {
+      /* determine the icon theme for the mapped menu */
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (menu));
+
+      /* add menu items for all infos */
+      for (lp = info_list; lp != NULL; lp = lp->next)
+        {
+          /* determine the info */
+          info = lp->data;
+
+          /* generate a label by stripping off the extension */
+          label = g_strdup (info->display_name);
+          dot = g_utf8_strrchr (label, -1, '.');
+          if (G_LIKELY (dot != NULL))
+            *dot = '\0';
+
+          /* allocate a new menu item */
+          item = gtk_image_menu_item_new_with_label (label);
+          g_object_set_data_full (G_OBJECT (item), I_("thunar-vfs-info"), info, (GDestroyNotify) thunar_vfs_info_unref);
+          g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (item_activated), templates_action);
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+          gtk_widget_show (item);
+
+          /* lookup the icon for the mime type of that file */
+          icon_name = thunar_vfs_mime_info_lookup_icon_name (info->mime_info, icon_theme);
+
+          /* generate an image based on the named icon */
+          image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+          gtk_widget_show (image);
+
+          /* cleanup */
+          g_free (label);
+        }
+
+      /* release the info list itself */
+      g_list_free (info_list);
+    }
+  else
+    {
+      /* tell the user that no templates were found */
+      item = gtk_menu_item_new_with_label (_("No Templates installed"));
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_set_sensitive (item, FALSE);
+      gtk_widget_show (item);
+    }
+
+  /* append a menu separator */
+  item = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_show (item);
+
+  /* add the "Empty File" item */
+  item = gtk_image_menu_item_new_with_mnemonic (_("_Empty File"));
+  g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (item_activated), templates_action);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_show (item);
+
+  /* add the icon for the emtpy file item */
+  image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_widget_show (image);
+}
+
+
+
+static void
+thunar_templates_action_menu_mapped (GtkWidget             *menu,
+                                     ThunarTemplatesAction *templates_action)
+{
+  g_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
+  g_return_if_fail (GTK_IS_MENU_SHELL (menu));
+
+  /* check if we already added our children to the submenu */
+  if (G_LIKELY (GTK_MENU_SHELL (menu)->children != NULL))
+    return;
+
+  /* generate the menu */
+  thunar_templates_action_build_menu (templates_action, menu);
+
+  /* check if we're already monitoring ~/Templates for changes */
+  if (G_UNLIKELY (templates_action->templates_monitor == NULL))
+    {
+      /* grab a reference on the VFS monitor */
+      templates_action->templates_monitor = thunar_vfs_monitor_get_default ();
+      templates_action->templates_handle = thunar_vfs_monitor_add_directory (templates_action->templates_monitor,
+                                                                             templates_action->templates_path,
+                                                                             thunar_templates_action_monitor,
+                                                                             templates_action);
+    }
+}
+
+
+
+static void
+thunar_templates_action_monitor (ThunarVfsMonitor       *monitor,
+                                 ThunarVfsMonitorHandle *handle,
+                                 ThunarVfsMonitorEvent   event,
+                                 ThunarVfsPath          *handle_path,
+                                 ThunarVfsPath          *event_path,
+                                 gpointer                user_data)
+{
+  ThunarTemplatesAction *templates_action = THUNAR_TEMPLATES_ACTION (user_data);
+  GtkWidget             *menu;
+  GSList                *lp;
+  GList                 *children;
+
+  g_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
+  g_return_if_fail (templates_action->templates_monitor == monitor);
+  g_return_if_fail (templates_action->templates_handle == handle);
+
+  /* clear all menus for all menu proxies (will be rebuild on-demand) */
+  for (lp = gtk_action_get_proxies (GTK_ACTION (templates_action)); lp != NULL; lp = lp->next)
+    if (G_LIKELY (GTK_IS_MENU_ITEM (lp->data)))
+      {
+        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (lp->data));
+        if (G_UNLIKELY (menu == NULL))
+          continue;
+
+        /* we clear the menu */
+        children = gtk_container_get_children (GTK_CONTAINER (menu));
+        g_list_foreach (children, (GFunc) gtk_widget_destroy, NULL);
+        g_list_free (children);
+
+        /* regenerate it if its currently mapped */
+        if (G_UNLIKELY (GTK_WIDGET_MAPPED (menu)))
+          thunar_templates_action_build_menu (templates_action, menu);
+      }
+}
+
+
+
+/**
+ * thunar_templates_action_new:
+ * @name  : the internal name of the action.
+ * @label : the label for the action.
+ *
+ * Allocates a new #ThunarTemplatesAction with the given
+ * @name and @label.
+ *
+ * Return value: the newly allocated #ThunarTemplatesAction.
+ **/
+GtkAction*
+thunar_templates_action_new (const gchar *name,
+                             const gchar *label)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (label != NULL, NULL);
+
+  return g_object_new (THUNAR_TYPE_TEMPLATES_ACTION,
+                       "hide-if-empty", FALSE,
+                       "label", label,
+                       "name", name,
+                       NULL);
+}
+
+
diff --git a/thunar/thunar-templates-action.h b/thunar/thunar-templates-action.h
new file mode 100644
index 0000000000000000000000000000000000000000..c79c70def4b1ded4dbc67e5fca1e1672a1de1089
--- /dev/null
+++ b/thunar/thunar-templates-action.h
@@ -0,0 +1,44 @@
+/* $Id$ */
+/*-
+ * 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
+ * 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_TEMPLATES_ACTION_H__
+#define __THUNAR_TEMPLATES_ACTION_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarTemplatesActionClass ThunarTemplatesActionClass;
+typedef struct _ThunarTemplatesAction      ThunarTemplatesAction;
+
+#define THUNAR_TYPE_TEMPLATES_ACTION            (thunar_templates_action_get_type ())
+#define THUNAR_TEMPLATES_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_TYPE_TEMPLATES_ACTION, ThunarTemplatesAction))
+#define THUNAR_TEMPLATES_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_TYPE_TEMPLATES_ACTION, ThunarTemplatesActionClass))
+#define THUNAR_IS_TEMPLATES_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_TYPE_TEMPLATES_ACTION))
+#define THUNAR_IS_TEMPLATES_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_TYPE_TEMPLATES_ACTION))
+#define THUNAR_TEMPLATES_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_TYPE_TEMPLATES_ACTION, ThunarTemplatesActionClass))
+
+GType      thunar_templates_action_get_type (void) G_GNUC_CONST;
+
+GtkAction *thunar_templates_action_new      (const gchar *name,
+                                             const gchar *label) G_GNUC_MALLOC;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_TEMPLATES_ACTION_H__ */
diff --git a/thunar/thunar-window-ui.xml b/thunar/thunar-window-ui.xml
index 4190ab43fc8b6925425cd34d8d52ba0915d5b2db..4004523673daf96fded4a58ea9d5bbcee7247a8b 100644
--- a/thunar/thunar-window-ui.xml
+++ b/thunar/thunar-window-ui.xml
@@ -3,7 +3,7 @@
   <!--
     $Id$
 
-    Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+    Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
 
     Thunar main window user interface description file. Do NOT
     simply edit this file if you don't know how the whole system
@@ -59,6 +59,7 @@
       <menuitem action="forward" name="forward" />
       <separator />
       <menuitem action="open-home" name="open-home" />
+      <menuitem action="open-templates" name="open-templates" />
       <menuitem action="open-location" name="open-location" />
     </menu>
 
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 876d12912dc1c9f0b9dcac9c1b81acad1198a8ad..5c65bad304eb0602903e21d574450b197c3a5926 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -32,9 +32,11 @@
 #include <thunar/thunar-location-buttons.h>
 #include <thunar/thunar-location-dialog.h>
 #include <thunar/thunar-location-entry.h>
+#include <thunar/thunar-pango-extensions.h>
 #include <thunar/thunar-preferences-dialog.h>
 #include <thunar/thunar-preferences.h>
 #include <thunar/thunar-statusbar.h>
+#include <thunar/thunar-stock.h>
 #include <thunar/thunar-window.h>
 #include <thunar/thunar-window-ui.h>
 
@@ -64,6 +66,8 @@ static void     thunar_window_set_property                (GObject            *o
                                                            GParamSpec         *pspec);
 static void     thunar_window_realize                     (GtkWidget          *widget);
 static void     thunar_window_unrealize                   (GtkWidget          *widget);
+static gboolean thunar_window_configure_event             (GtkWidget          *widget,
+                                                           GdkEventConfigure  *event);
 static void     thunar_window_merge_custom_preferences    (ThunarWindow       *window);
 static void     thunar_window_action_open_new_window      (GtkAction          *action,
                                                            ThunarWindow       *window);
@@ -86,6 +90,8 @@ static void     thunar_window_action_go_up                (GtkAction          *a
                                                            ThunarWindow       *window);
 static void     thunar_window_action_open_home            (GtkAction          *action,
                                                            ThunarWindow       *window);
+static void     thunar_window_action_open_templates       (GtkAction          *action,
+                                                           ThunarWindow       *window);
 static void     thunar_window_action_open_location        (GtkAction          *action,
                                                            ThunarWindow       *window);
 static void     thunar_window_action_about                (GtkAction          *action,
@@ -111,6 +117,8 @@ static void     thunar_window_notify_loading              (ThunarView         *v
                                                            ThunarWindow       *window);
 static gboolean thunar_window_merge_idle                  (gpointer            user_data);
 static void     thunar_window_merge_idle_destroy          (gpointer            user_data);
+static gboolean thunar_window_save_geometry_timer         (gpointer            user_data);
+static void     thunar_window_save_geometry_timer_destroy (gpointer            user_data);
 
 
 
@@ -157,6 +165,9 @@ struct _ThunarWindow
 
   /* menu merge idle source */
   gint                    merge_idle_id;
+
+  /* support to remember window geometry */
+  gint                    save_geometry_timer_id;
 };
 
 
@@ -174,14 +185,11 @@ static const GtkActionEntry action_entries[] =
   { "view-side-pane-menu", NULL, N_ ("_Side Pane"), NULL, },
   { "go-menu", NULL, N_ ("_Go"), NULL, },
   { "open-parent", GTK_STOCK_GO_UP, N_ ("Open _Parent"), "<alt>Up", N_ ("Open the parent folder"), G_CALLBACK (thunar_window_action_go_up), },
-  { "open-home", GTK_STOCK_HOME, N_ ("_Home"), "<alt>Home", N_ ("Open the home folder"), G_CALLBACK (thunar_window_action_open_home), },
+  { "open-home", GTK_STOCK_HOME, N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), },
+  { "open-templates", THUNAR_STOCK_TEMPLATES, N_ ("T_emplates"), NULL, N_ ("Go to the templates folder"), G_CALLBACK (thunar_window_action_open_templates), },
   { "open-location", NULL, N_ ("Open _Location..."), "<control>L", N_ ("Specify a location to open"), G_CALLBACK (thunar_window_action_open_location), },
   { "help-menu", NULL, N_ ("_Help"), NULL, },
-#if GTK_CHECK_VERSION(2,6,0)
   { "about", GTK_STOCK_ABOUT, N_ ("_About"), NULL, N_ ("Display information about Thunar"), G_CALLBACK (thunar_window_action_about), },
-#else
-  { "about", GTK_STOCK_DIALOG_INFO, N_ ("_About"), NULL, N_ ("Display information about Thunar"), G_CALLBACK (thunar_window_action_about), },
-#endif
 };
 
 static const GtkToggleActionEntry toggle_action_entries[] =
@@ -242,6 +250,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
   gtkwidget_class = GTK_WIDGET_CLASS (klass);
   gtkwidget_class->realize = thunar_window_realize;
   gtkwidget_class->unrealize = thunar_window_unrealize;
+  gtkwidget_class->configure_event = thunar_window_configure_event;
 
   /**
    * ThunarWindow:current-directory:
@@ -301,6 +310,8 @@ thunar_window_init (ThunarWindow *window)
   GSList         *group;
   gchar          *type_name;
   GType           type;
+  gint            width;
+  gint            height;
 
   /* grab a reference on the provider factory */
   window->provider_factory = thunarx_provider_factory_get_default ();
@@ -400,8 +411,9 @@ thunar_window_init (ThunarWindow *window)
   accel_group = gtk_ui_manager_get_accel_group (window->ui_manager);
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
-  gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
-  gtk_window_set_title (GTK_WINDOW (window), _("Thunar"));
+  /* determine the default window size from the preferences */
+  g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, NULL);
+  gtk_window_set_default_size (GTK_WINDOW (window), width, height);
 
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -493,6 +505,10 @@ thunar_window_dispose (GObject *object)
 {
   ThunarWindow *window = THUNAR_WINDOW (object);
 
+  /* destroy the save geometry timer source */
+  if (G_UNLIKELY (window->save_geometry_timer_id > 0))
+    g_source_remove (window->save_geometry_timer_id);
+
   /* destroy the merge idle source */
   if (G_UNLIKELY (window->merge_idle_id > 0))
     g_source_remove (window->merge_idle_id);
@@ -627,6 +643,34 @@ thunar_window_unrealize (GtkWidget *widget)
 
 
 
+static gboolean
+thunar_window_configure_event (GtkWidget         *widget,
+                               GdkEventConfigure *event)
+{
+  ThunarWindow *window = THUNAR_WINDOW (widget);
+
+  /* check if we have a new dimension here */
+  if (widget->allocation.width != event->width || widget->allocation.height != event->height)
+    {
+      /* drop any previous timer source */
+      if (window->save_geometry_timer_id > 0)
+        g_source_remove (window->save_geometry_timer_id);
+
+      /* check if we should schedule another save timer */
+      if (GTK_WIDGET_VISIBLE (widget))
+        {
+          /* save the geometry one second after the last configure event */
+          window->save_geometry_timer_id = g_timeout_add_full (G_PRIORITY_LOW, 1000, thunar_window_save_geometry_timer,
+                                                               window, thunar_window_save_geometry_timer_destroy);
+        }
+    }
+
+  /* let Gtk+ handle the configure event */
+  return (*GTK_WIDGET_CLASS (thunar_window_parent_class)->configure_event) (widget, event);
+}
+
+
+
 static void
 thunar_window_merge_custom_preferences (ThunarWindow *window)
 {
@@ -972,6 +1016,115 @@ thunar_window_action_open_home (GtkAction    *action,
 
 
 
+static void
+thunar_window_action_open_templates (GtkAction    *action,
+                                     ThunarWindow *window)
+{
+  ThunarVfsPath *home_path;
+  ThunarVfsPath *templates_path;
+  ThunarFile    *templates_file = NULL;
+  GtkWidget     *dialog;
+  GtkWidget     *button;
+  GtkWidget     *label;
+  GtkWidget     *image;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  gboolean       show_about_templates;
+  GError        *error = NULL;
+  gchar         *absolute_path;
+
+  g_return_if_fail (GTK_IS_ACTION (action));
+  g_return_if_fail (THUNAR_IS_WINDOW (window));
+
+  /* determine the path to the ~/Templates folder */
+  home_path = thunar_vfs_path_get_for_home ();
+  templates_path = thunar_vfs_path_relative (home_path, "Templates");
+  thunar_vfs_path_unref (home_path);
+
+  /* make sure that the ~/Templates folder exists */
+  absolute_path = thunar_vfs_path_dup_string (templates_path);
+  xfce_mkdirhier (absolute_path, 0755, &error);
+  g_free (absolute_path);
+
+  /* determine the file for the ~/Templates path */
+  if (G_LIKELY (error == NULL))
+    templates_file = thunar_file_get_for_path (templates_path, &error);
+
+  /* open the ~/Templates folder */
+  if (G_LIKELY (templates_file != NULL))
+    {
+      /* go to the ~/Templates folder */
+      thunar_window_set_current_directory (window, templates_file);
+      g_object_unref (G_OBJECT (templates_file));
+
+      /* check whether we should display the "About Templates" dialog */
+      g_object_get (G_OBJECT (window->preferences), "misc-show-about-templates", &show_about_templates, NULL);
+      if (G_UNLIKELY (show_about_templates))
+        {
+          /* display the "About Templates" dialog */
+          dialog = gtk_dialog_new_with_buttons (_("About Templates"), GTK_WINDOW (window),
+                                                GTK_DIALOG_DESTROY_WITH_PARENT
+                                                | GTK_DIALOG_NO_SEPARATOR,
+                                                GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                                NULL);
+          gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+          hbox = gtk_hbox_new (FALSE, 6);
+          gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+          gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
+          gtk_widget_show (hbox);
+
+          image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+          gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+          gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+          gtk_widget_show (image);
+
+          vbox = gtk_vbox_new (FALSE, 18);
+          gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+          gtk_widget_show (vbox);
+
+          label = gtk_label_new (_("All files in this folder will appear in the \"Create Document\" menu."));
+          gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+          gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big_bold ());
+          gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+          gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+          gtk_widget_show (label);
+
+          label = gtk_label_new (_("You can create templates from documents that you "
+                                   "frequently create. For this to work, copy a "
+                                   "document into this folder and Thunar will have an "
+                                   "entry for it in the \"Create Document\" menu.\n\n"
+                                   "You can then select the entry from the \"Create "
+                                   "Document\" menu and a copy of the document will "
+                                   "be created in the directory you are viewing."));
+          gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+          gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+          gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+          gtk_widget_show (label);
+
+          button = gtk_check_button_new_with_mnemonic (_("Do _not display this message again"));
+          exo_mutual_binding_new_with_negation (G_OBJECT (window->preferences), "misc-show-about-templates", G_OBJECT (button), "active");
+          gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+          gtk_widget_show (button);
+
+          gtk_dialog_run (GTK_DIALOG (dialog));
+          gtk_widget_destroy (dialog);
+        }
+    }
+
+  /* display an error dialog if something went wrong */
+  if (G_UNLIKELY (error != NULL))
+    {
+      thunar_dialogs_show_error (GTK_WIDGET (window), error, _("Failed to open templates folder"));
+      g_error_free (error);
+    }
+
+  /* release our reference on the ~/Templates path */
+  thunar_vfs_path_unref (templates_path);
+}
+
+
+
 static void
 thunar_window_action_open_location (GtkAction    *action,
                                     ThunarWindow *window)
@@ -1221,6 +1374,48 @@ thunar_window_merge_idle_destroy (gpointer user_data)
 
 
 
+static gboolean
+thunar_window_save_geometry_timer (gpointer user_data)
+{
+  GdkWindowState state;
+  ThunarWindow  *window = THUNAR_WINDOW (user_data);
+  gint           width;
+  gint           height;
+
+  GDK_THREADS_ENTER ();
+
+  /* check if the window is still visible */
+  if (GTK_WIDGET_VISIBLE (window))
+    {
+      /* determine the current state of the window */
+      state = gdk_window_get_state (GTK_WIDGET (window)->window);
+
+      /* don't save geometry for maximized or fullscreen windows */
+      if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) == 0)
+        {
+          /* determine the current width/height of the window... */
+          gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+
+          /* ...and remember them as default for new windows */
+          g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height, NULL);
+        }
+    }
+
+  GDK_THREADS_LEAVE ();
+
+  return FALSE;
+}
+
+
+
+static void
+thunar_window_save_geometry_timer_destroy (gpointer user_data)
+{
+  THUNAR_WINDOW (user_data)->save_geometry_timer_id = 0;
+}
+
+
+
 /**
  * thunar_window_new:
  *