Updated Spanish translation

author: Daniel Mustieles <daniel.mustieles@gmail.com> 2016-04-27 21:08:40 +0200
committer: Daniel Mustieles <daniel.mustieles@gmail.com> 2016-04-27 21:08:40 +0200
commit: e6a384f5757d8bc503f4138ac80430c4fde860d6 (patch)
tree: 6577cb4fc5da745a09d1904f161ae712383e26f1
parent: 4df06e7f14ffefedc65bae84fca1cd7f5e945f78 (diff)
download: nautilus-e6a384f5757d8bc503f4138ac80430c4fde860d6.tar.gz
1 files changed, 1007 insertions, 949 deletions
diff --git a/po/es.po b/po/es.po
index 7258a0488..2fabf0f79 100644
--- a/po/es.po
+++ b/po/es.po
@@ -27,8 +27,8 @@ msgstr ""
 "Project-Id-Version: nautilus.master.es\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=nautilus&keywords=I18N+L10N&component=Internationalization (i18n)\n"
-"POT-Creation-Date: 2016-02-15 10:52+0000\n"
-"PO-Revision-Date: 2016-02-16 15:45+0100\n"
+"POT-Creation-Date: 2016-04-26 01:39+0000\n"
+"PO-Revision-Date: 2016-04-26 15:36+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -84,8 +84,8 @@ msgstr "Ejecutar programa"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:198
 #: ../data/org.gnome.Nautilus.desktop.in.in.h:1
-#: ../src/nautilus-mime-actions.c:99 ../src/nautilus-properties-window.c:4197
-#: ../src/nautilus-window.c:2634
+#: ../src/nautilus-mime-actions.c:97 ../src/nautilus-properties-window.c:4160
+#: ../src/nautilus-window.c:2787
 msgid "Files"
 msgstr "Archivos"
 
@@ -127,16 +127,17 @@ msgstr ""
 "barra de rutas."
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:5
-#, fuzzy
 #| msgid "Whether to enable local recursive search or not"
 msgid "Where to perform recursive search"
-msgstr "Indica si se debe activar o no la búsqueda recursiva local"
+msgstr "Indica si se debe realizar una la búsqueda recursiva"
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:6
 msgid ""
 "In which locations Nautilus should search on subfolders. Available values "
 "are 'local-only', 'always', 'never'."
 msgstr ""
+"En qué ubicaciones deberá Nautilus buscar en subcarpetas. Los valores "
+"disponibles son 'local-only', 'always', 'never'."
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:7
 msgid "Filter the search dates using either last used or last modified"
@@ -423,12 +424,14 @@ msgstr ""
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:45
 msgid "What viewer should be used when searching"
-msgstr ""
+msgstr "Qué visor se debe usar al buscar"
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:46
 msgid ""
 "When searching Nautilus will switch to the type of view in this setting."
 msgstr ""
+"Cuando al buscar con Nautilus se cambiará al tipo de vista en esta opción de "
+"configuración."
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:47
 msgid "Bulk rename utility"
@@ -496,12 +499,15 @@ msgid "Default Thumbnail Icon Size"
 msgstr "Tamaño predeterminado de las miniaturas"
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:56
+#| msgid ""
+#| "The default size of an icon for a thumbnail in the icon view when using "
+#| "NAUTILUS_ICON_SIZE_SMALL size."
 msgid ""
 "The default size of an icon for a thumbnail in the icon view when using "
-"NAUTILUS_ICON_SIZE_SMALL size."
+"NAUTILUS_ICON_SIZE_STANDARD size."
 msgstr ""
 "El tamaño predeterminado para la miniatura de un icono en la vista como "
-"iconos al usar el tamaño NAUTILUS_ICON_SIZE_SMALL."
+"iconos al usar el tamaño NAUTILUS_ICON_SIZE_STANDARD."
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:57
 msgid "Text Ellipsis Limit"
@@ -770,69 +776,66 @@ msgstr ""
 "Si se establece a cierto, la ventas nuevas abiertas tendrán el panel lateral "
 "visible."
 
-#: ../eel/eel-canvas.c:1254 ../eel/eel-canvas.c:1255
+#: ../eel/eel-canvas.c:1253 ../eel/eel-canvas.c:1254
 msgid "X"
 msgstr "X"
 
-#: ../eel/eel-canvas.c:1261 ../eel/eel-canvas.c:1262
+#: ../eel/eel-canvas.c:1260 ../eel/eel-canvas.c:1261
 msgid "Y"
 msgstr "Y"
 
-#: ../eel/eel-gtk-extensions.c:326
+#: ../eel/eel-gtk-extensions.c:325
 msgid "Show more _details"
 msgstr "Mostrar más _detalles"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
 #. Put up the timed wait window.
-#: ../eel/eel-stock-dialogs.c:195
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:542
-#: ../libnautilus-private/nautilus-file-operations.c:183
-#: ../src/nautilus-files-view.c:1102 ../src/nautilus-files-view.c:1576
-#: ../src/nautilus-files-view.c:5281 ../src/nautilus-location-entry.c:270
-#: ../src/nautilus-mime-actions.c:560 ../src/nautilus-mime-actions.c:564
-#: ../src/nautilus-mime-actions.c:635 ../src/nautilus-mime-actions.c:978
-#: ../src/nautilus-mime-actions.c:1488 ../src/nautilus-mime-actions.c:1717
-#: ../src/nautilus-properties-window.c:4188
-#: ../src/nautilus-properties-window.c:5170
-#: ../src/nautilus-search-popover.c:535
+#: ../eel/eel-stock-dialogs.c:194 ../src/nautilus-file-conflict-dialog.c:554
+#: ../src/nautilus-file-operations.c:179 ../src/nautilus-files-view.c:1013
+#: ../src/nautilus-files-view.c:1488 ../src/nautilus-files-view.c:5218
+#: ../src/nautilus-location-entry.c:269 ../src/nautilus-mime-actions.c:558
+#: ../src/nautilus-mime-actions.c:562 ../src/nautilus-mime-actions.c:633
+#: ../src/nautilus-mime-actions.c:969 ../src/nautilus-mime-actions.c:1476
+#: ../src/nautilus-mime-actions.c:1706
+#: ../src/nautilus-properties-window.c:4151
+#: ../src/nautilus-properties-window.c:5145
+#: ../src/nautilus-search-popover.c:539
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: ../eel/eel-stock-dialogs.c:204
+#: ../eel/eel-stock-dialogs.c:203
 msgid "You can stop this operation by clicking cancel."
 msgstr "Puede parar esta operación pulsando cancelar."
 
-#: ../eel/eel-vfs-extensions.c:98
+#: ../eel/eel-vfs-extensions.c:97
 msgid " (invalid Unicode)"
 msgstr " (Unicode no válido)"
 
 # src/nautilus-location-bar.c:401
-#: ../libnautilus-private/nautilus-bookmark.c:107
-#: ../libnautilus-private/nautilus-file-utilities.c:273
-#: ../src/nautilus-pathbar.c:408
+#: ../src/nautilus-bookmark.c:106 ../src/nautilus-file-utilities.c:282
+#: ../src/nautilus-pathbar.c:412
 msgid "Other Locations"
 msgstr "Otras ubicaciones"
 
-#: ../libnautilus-private/nautilus-bookmark.c:109
-#: ../libnautilus-private/nautilus-desktop-link.c:129
-#: ../libnautilus-private/nautilus-file-utilities.c:265
-#: ../src/nautilus-list-view.c:1490 ../src/nautilus-pathbar.c:406
+#: ../src/nautilus-bookmark.c:108 ../src/nautilus-file-utilities.c:266
+#: ../nautilus-desktop/nautilus-desktop-link.c:132
+#: ../src/nautilus-list-view.c:1489 ../src/nautilus-pathbar.c:410
 #: ../src/nautilus-shell-search-provider.c:292
 msgid "Home"
 msgstr "Carpeta personal"
 
-#: ../libnautilus-private/nautilus-canvas-container.c:2460
+#: ../src/nautilus-canvas-container.c:2483
 msgid "The selection rectangle"
 msgstr "El rectángulo de selección"
 
 # src/file-manager/fm-directory-view.c:2403
 # src/file-manager/fm-directory-view.c:2646
-#: ../libnautilus-private/nautilus-column-chooser.c:416
+#: ../src/nautilus-column-chooser.c:415
 msgid "Reset to De_fault"
 msgstr "Restaurar a _predeterminada"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:418
+#: ../src/nautilus-column-chooser.c:417
 msgid "Replace the current List Columns settings with the default settings"
 msgstr ""
 "Reemplazar la configuración actual de listar columnas con la configuración "
@@ -844,13 +847,12 @@ msgstr ""
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: ../libnautilus-private/nautilus-column-utilities.c:57
-#: ../src/nautilus-list-view.c:1713
+#: ../src/nautilus-column-utilities.c:56 ../src/nautilus-list-view.c:1714
 #: ../src/resources/ui/nautilus-rename-file-popover.ui.h:1
 msgid "Name"
 msgstr "Nombre"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:58
+#: ../src/nautilus-column-utilities.c:57
 msgid "The name and icon of the file."
 msgstr "El nombre e icono del archivo."
 
@@ -858,11 +860,11 @@ msgstr "El nombre e icono del archivo."
 # libnautilus-private/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
 # src/file-manager/fm-search-list-view.c:146
-#: ../libnautilus-private/nautilus-column-utilities.c:64
+#: ../src/nautilus-column-utilities.c:63
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:65
+#: ../src/nautilus-column-utilities.c:64
 msgid "The size of the file."
 msgstr "El tamaño del archivo."
 
@@ -870,212 +872,200 @@ msgstr "El tamaño del archivo."
 # libnautilus-private/nautilus-search-bar-criterion.c:44
 # src/file-manager/fm-list-view.c:1593
 # src/file-manager/fm-search-list-view.c:152
-#: ../libnautilus-private/nautilus-column-utilities.c:71
+#: ../src/nautilus-column-utilities.c:70
 msgid "Type"
 msgstr "Tipo"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:72
+#: ../src/nautilus-column-utilities.c:71
 msgid "The type of the file."
 msgstr "El tipo de archivo."
 
 # src/file-manager/fm-properties-window.c:1103
-#: ../libnautilus-private/nautilus-column-utilities.c:78
+#: ../src/nautilus-column-utilities.c:77
 msgid "Modified"
 msgstr "Modificado"
 
 # src/nautilus-window-manage-views.c:1287
-#: ../libnautilus-private/nautilus-column-utilities.c:79
-#: ../libnautilus-private/nautilus-column-utilities.c:137
+#: ../src/nautilus-column-utilities.c:78
+#: ../src/nautilus-column-utilities.c:136
 msgid "The date the file was modified."
 msgstr "La fecha en que el archivo fue modificado."
 
 # src/file-manager/fm-properties-window.c:1105
-#: ../libnautilus-private/nautilus-column-utilities.c:87
+#: ../src/nautilus-column-utilities.c:86
 msgid "Accessed"
 msgstr "Accedido"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:88
+#: ../src/nautilus-column-utilities.c:87
 msgid "The date the file was accessed."
 msgstr "La fecha en que el archivo fue accedido."
 
 # src/file-manager/fm-properties-window.c:1554
-#: ../libnautilus-private/nautilus-column-utilities.c:97
+#: ../src/nautilus-column-utilities.c:96
 msgid "Owner"
 msgstr "Propietario"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../libnautilus-private/nautilus-column-utilities.c:98
+#: ../src/nautilus-column-utilities.c:97
 msgid "The owner of the file."
 msgstr "El propietario del archivo."
 
 # src/file-manager/fm-properties-window.c:1557
-#: ../libnautilus-private/nautilus-column-utilities.c:105
+#: ../src/nautilus-column-utilities.c:104
 msgid "Group"
 msgstr "Grupo"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../libnautilus-private/nautilus-column-utilities.c:106
+#: ../src/nautilus-column-utilities.c:105
 msgid "The group of the file."
 msgstr "El grupo del archivo."
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../libnautilus-private/nautilus-column-utilities.c:113
-#: ../src/nautilus-properties-window.c:4257
+#: ../src/nautilus-column-utilities.c:112
+#: ../src/nautilus-properties-window.c:4220
 msgid "Permissions"
 msgstr "Permisos"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../libnautilus-private/nautilus-column-utilities.c:114
+#: ../src/nautilus-column-utilities.c:113
 msgid "The permissions of the file."
 msgstr "Los permisos del archivo."
 
 # src/file-manager/fm-icon-text-window.c:84
-#: ../libnautilus-private/nautilus-column-utilities.c:121
+#: ../src/nautilus-column-utilities.c:120
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:122
-#| msgid "The type of the file."
+#: ../src/nautilus-column-utilities.c:121
 msgid "The MIME type of the file."
 msgstr "El tipo MIME del archivo."
 
 # src/nautilus-location-bar.c:401
-#: ../libnautilus-private/nautilus-column-utilities.c:129
-#: ../src/nautilus-image-properties-page.c:415
+#: ../src/nautilus-column-utilities.c:128
+#: ../src/nautilus-image-properties-page.c:414
 msgid "Location"
 msgstr "Lugar"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../libnautilus-private/nautilus-column-utilities.c:130
+#: ../src/nautilus-column-utilities.c:129
 msgid "The location of the file."
 msgstr "La ubicación del archivo."
 
 # src/file-manager/fm-properties-window.c:1103
-#: ../libnautilus-private/nautilus-column-utilities.c:136
+#: ../src/nautilus-column-utilities.c:135
 msgid "Modified - Time"
 msgstr "Modificado - Fecha"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:179
+#: ../src/nautilus-column-utilities.c:178
 msgid "Trashed On"
 msgstr "Movido a la papelera en"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:180
+#: ../src/nautilus-column-utilities.c:179
 msgid "Date when file was moved to the Trash"
 msgstr "La fecha en la que el archivo se movió a la papelera"
 
 # libnautilus-private/nautilus-global-preferences.c:693
-#: ../libnautilus-private/nautilus-column-utilities.c:187
+#: ../src/nautilus-column-utilities.c:186
 msgid "Original Location"
 msgstr "Lugar original"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:188
+#: ../src/nautilus-column-utilities.c:187
 msgid "Original location of file before moved to the Trash"
 msgstr "Lugar original del archivo antes de moverlo a la papelera"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:205
+#: ../src/nautilus-column-utilities.c:204
 msgid "Relevance"
 msgstr "Relevancia"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:206
+#: ../src/nautilus-column-utilities.c:205
 msgid "Relevance rank for search"
 msgstr "Relevancia del rango de búsqueda"
 
-#: ../libnautilus-private/nautilus-desktop-directory-file.c:433
-#: ../libnautilus-private/nautilus-desktop-icon-file.c:149
-msgid "on the desktop"
-msgstr "en el escritorio"
-
 #. Translators: this is of the format "hostname (uri-scheme)"
-#: ../libnautilus-private/nautilus-directory.c:517
+#: ../src/nautilus-directory.c:524
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # libnautilus-private/nautilus-program-chooser.c:1344
-#: ../libnautilus-private/nautilus-dnd.c:747
+#: ../src/nautilus-dnd.c:767
 msgid "_Move Here"
 msgstr "_Mover aquí"
 
-#: ../libnautilus-private/nautilus-dnd.c:752
+#: ../src/nautilus-dnd.c:772
 msgid "_Copy Here"
 msgstr "_Copiar aquí"
 
 # src/nautilus-link-set-window.c:185
-#: ../libnautilus-private/nautilus-dnd.c:757
+#: ../src/nautilus-dnd.c:777
 msgid "_Link Here"
 msgstr "En_lazar aquí"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: ../libnautilus-private/nautilus-dnd.c:764
+#: ../src/nautilus-dnd.c:784
 #: ../src/resources/ui/nautilus-create-folder-dialog.ui.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../libnautilus-private/nautilus-file.c:1235
-#: ../libnautilus-private/nautilus-vfs-file.c:369
+#: ../src/nautilus-file.c:1210 ../src/nautilus-vfs-file.c:368
 msgid "This file cannot be mounted"
 msgstr "Este archivo no se puede montar"
 
-#: ../libnautilus-private/nautilus-file.c:1280
+#: ../src/nautilus-file.c:1255
 msgid "This file cannot be unmounted"
 msgstr "Este archivo no se puede desmontar"
 
-#: ../libnautilus-private/nautilus-file.c:1314
+#: ../src/nautilus-file.c:1289
 msgid "This file cannot be ejected"
 msgstr "Este archivo no se puede expulsar"
 
-#: ../libnautilus-private/nautilus-file.c:1347
-#: ../libnautilus-private/nautilus-vfs-file.c:547
+#: ../src/nautilus-file.c:1322 ../src/nautilus-vfs-file.c:546
 msgid "This file cannot be started"
 msgstr "Este archivo no se puede iniciar"
 
-#: ../libnautilus-private/nautilus-file.c:1399
-#: ../libnautilus-private/nautilus-file.c:1430
+#: ../src/nautilus-file.c:1374 ../src/nautilus-file.c:1405
 msgid "This file cannot be stopped"
 msgstr "Este archivo no se puede parar"
 
-#: ../libnautilus-private/nautilus-file.c:1846
-#, c-format
-msgid "Slashes are not allowed in filenames"
-msgstr "No se permiten barras en los nombres de archivo"
-
-#: ../libnautilus-private/nautilus-file.c:1864
+#: ../src/nautilus-file.c:1829
 #, c-format
 msgid "File not found"
 msgstr "No se encontró el archivo"
 
+#: ../src/nautilus-file.c:1864
+#, c-format
+msgid "Slashes are not allowed in filenames"
+msgstr "No se permiten barras en los nombres de archivo"
+
 # src/file-manager/fm-properties-window.c:1641
-#: ../libnautilus-private/nautilus-file.c:1892
+#: ../src/nautilus-file.c:1898
 #, c-format
 msgid "Toplevel files cannot be renamed"
 msgstr "Los archivos de nivel superior no se pueden renombrar"
 
-#: ../libnautilus-private/nautilus-file.c:1915
-#, c-format
-msgid "Unable to rename desktop icon"
-msgstr "No se pudo renombrar el icono del escritorio"
-
-#: ../libnautilus-private/nautilus-file.c:1944
+#: ../src/nautilus-file.c:1924
 #, c-format
-msgid "Unable to rename desktop file"
-msgstr "No se pudo renombrar el archivo del escritorio"
+msgid "Probably the content of the file is an invalid desktop file format"
+msgstr ""
+"Probablemente el contenido del archivo es un formato de archivo .desktop no "
+"válido"
 
 #. Translators: Time in 24h format
-#: ../libnautilus-private/nautilus-file.c:4753
+#: ../src/nautilus-file.c:4740
 msgid "%H:%M"
 msgstr "%H:%M"
 
 # libnautilus-private/nautilus-file.c:1557
 #. Translators: Time in 12h format
-#: ../libnautilus-private/nautilus-file.c:4756
+#: ../src/nautilus-file.c:4743
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:94
 # components/services/install/command-line/eazel-revert.c:78
 # components/services/install/command-line/eazel-uninstall.c:69
-#: ../libnautilus-private/nautilus-file.c:4763
+#: ../src/nautilus-file.c:4750
 #, no-c-format
 msgid "Yesterday"
 msgstr "Ayer"
@@ -1083,7 +1073,7 @@ msgstr "Ayer"
 # libnautilus-private/nautilus-file.c:1560
 #. Translators: this is the word Yesterday followed by
 #. * a time in 24h format. i.e. "Yesterday 23:04"
-#: ../libnautilus-private/nautilus-file.c:4769
+#: ../src/nautilus-file.c:4756
 #, no-c-format
 msgid "Yesterday %H:%M"
 msgstr "Ayer a las %H:%M"
@@ -1091,19 +1081,19 @@ msgstr "Ayer a las %H:%M"
 # libnautilus-private/nautilus-file.c:1560
 #. Translators: this is the word Yesterday followed by
 #. * a time in 12h format. i.e. "Yesterday 9:04 PM"
-#: ../libnautilus-private/nautilus-file.c:4774
+#: ../src/nautilus-file.c:4761
 #, no-c-format
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer a las %l:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:4782
+#: ../src/nautilus-file.c:4769
 #, no-c-format
 msgid "%a"
 msgstr "%a"
 
 #. Translators: this is the name of the week day followed by
 #. * a time in 24h format. i.e. "Monday 23:04"
-#: ../libnautilus-private/nautilus-file.c:4788
+#: ../src/nautilus-file.c:4775
 #, no-c-format
 msgid "%a %H:%M"
 msgstr "%a a las %H:%M"
@@ -1111,14 +1101,14 @@ msgstr "%a a las %H:%M"
 # libnautilus-private/nautilus-file.c:1557
 #. Translators: this is the week day name followed by
 #. * a time in 12h format. i.e. "Monday 9:04 PM"
-#: ../libnautilus-private/nautilus-file.c:4793
+#: ../src/nautilus-file.c:4780
 #, no-c-format
 msgid "%a %l:%M %p"
 msgstr "%a a las %l:%M %p"
 
 #. Translators: this is the day of the month followed
 #. * by the abbreviated month name i.e. "3 Feb"
-#: ../libnautilus-private/nautilus-file.c:4801
+#: ../src/nautilus-file.c:4788
 #, no-c-format
 msgid "%-e %b"
 msgstr "%-e %b"
@@ -1126,7 +1116,7 @@ msgstr "%-e %b"
 #. Translators: this is the day of the month followed
 #. * by the abbreviated month name followed by a time in
 #. * 24h format i.e. "3 Feb 23:04"
-#: ../libnautilus-private/nautilus-file.c:4808
+#: ../src/nautilus-file.c:4795
 #, no-c-format
 msgid "%-e %b %H:%M"
 msgstr "%-e %b a las %H:%M"
@@ -1135,7 +1125,7 @@ msgstr "%-e %b a las %H:%M"
 #. Translators: this is the day of the month followed
 #. * by the abbreviated month name followed by a time in
 #. * 12h format i.e. "3 Feb 9:04"
-#: ../libnautilus-private/nautilus-file.c:4814
+#: ../src/nautilus-file.c:4801
 #, no-c-format
 msgid "%-e %b %l:%M %p"
 msgstr "%-e %b a las %l:%M %p"
@@ -1143,7 +1133,7 @@ msgstr "%-e %b a las %l:%M %p"
 # libnautilus-private/nautilus-file.c:1565
 #. Translators: this is the day of the month followed by the abbreviated
 #. * month name followed by the year i.e. "3 Feb 2015"
-#: ../libnautilus-private/nautilus-file.c:4822
+#: ../src/nautilus-file.c:4809
 #, no-c-format
 msgid "%-e %b %Y"
 msgstr "%-e %b %Y"
@@ -1152,7 +1142,7 @@ msgstr "%-e %b %Y"
 #. Translators: this is the day number followed
 #. * by the abbreviated month name followed by the year followed
 #. * by a time in 24h format i.e. "3 Feb 2015 23:04"
-#: ../libnautilus-private/nautilus-file.c:4829
+#: ../src/nautilus-file.c:4816
 #, no-c-format
 msgid "%-e %b %Y %H:%M"
 msgstr "%-e %b %Y a las %H:%M"
@@ -1161,50 +1151,50 @@ msgstr "%-e %b %Y a las %H:%M"
 #. Translators: this is the day number followed
 #. * by the abbreviated month name followed by the year followed
 #. * by a time in 12h format i.e. "3 Feb 2015 9:04 PM"
-#: ../libnautilus-private/nautilus-file.c:4835
+#: ../src/nautilus-file.c:4822
 #, no-c-format
 msgid "%-e %b %Y %l:%M %p"
 msgstr "%-e %b %Y a las %l:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:4844
+#: ../src/nautilus-file.c:4831
 #, no-c-format
 msgid "%c"
 msgstr "%c"
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../libnautilus-private/nautilus-file.c:5243
+#: ../src/nautilus-file.c:5230
 #, c-format
 msgid "Not allowed to set permissions"
 msgstr "No se le permite establecer permisos"
 
-#: ../libnautilus-private/nautilus-file.c:5538
+#: ../src/nautilus-file.c:5525
 #, c-format
 msgid "Not allowed to set owner"
 msgstr "No se le permite establecer el propietario"
 
 # src/nautilus-window-menus.c:602
-#: ../libnautilus-private/nautilus-file.c:5556
+#: ../src/nautilus-file.c:5543
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "El propietario especificado «%s» no existe"
 
-#: ../libnautilus-private/nautilus-file.c:5820
+#: ../src/nautilus-file.c:5807
 #, c-format
 msgid "Not allowed to set group"
 msgstr "No se le permite establecer el grupo"
 
-#: ../libnautilus-private/nautilus-file.c:5838
+#: ../src/nautilus-file.c:5825
 #, c-format
 msgid "Specified group '%s' doesn't exist"
 msgstr "El grupo especificado «%s» no existe"
 
 #. Translators: "Me" is used to indicate the file is owned by me (the current user)
-#: ../libnautilus-private/nautilus-file.c:5973
+#: ../src/nautilus-file.c:5960
 msgid "Me"
 msgstr "Yo"
 
 # libnautilus-private/nautilus-file.c:2594
-#: ../libnautilus-private/nautilus-file.c:5997
+#: ../src/nautilus-file.c:5984
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
@@ -1212,7 +1202,7 @@ msgstr[0] "%u elemento"
 msgstr[1] "%u elementos"
 
 # libnautilus-private/nautilus-file.c:2595
-#: ../libnautilus-private/nautilus-file.c:5998
+#: ../src/nautilus-file.c:5985
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
@@ -1220,7 +1210,7 @@ msgstr[0] "%u carpeta"
 msgstr[1] "%u carpetas"
 
 # libnautilus-private/nautilus-file.c:2595
-#: ../libnautilus-private/nautilus-file.c:5999
+#: ../src/nautilus-file.c:5986
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
@@ -1229,20 +1219,18 @@ msgstr[1] "%u archivos"
 
 # libnautilus-private/nautilus-file.c:2585
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6400
-#: ../libnautilus-private/nautilus-file.c:6416
+#: ../src/nautilus-file.c:6387 ../src/nautilus-file.c:6403
 msgid "? items"
 msgstr "? elementos"
 
 # libnautilus-private/nautilus-file.c:2585
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6406
+#: ../src/nautilus-file.c:6393
 msgid "? bytes"
 msgstr "? bytes "
 
 # libnautilus-private/nautilus-file.c:2936
-#: ../libnautilus-private/nautilus-file.c:6423
-#: ../libnautilus-private/nautilus-file.c:6504
+#: ../src/nautilus-file.c:6410 ../src/nautilus-file.c:6491
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1250,84 +1238,77 @@ msgstr "Desconocido"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:6437
-#: ../src/nautilus-properties-window.c:1185
+#: ../src/nautilus-file.c:6424 ../src/nautilus-properties-window.c:1159
 msgid "unknown"
 msgstr "desconocido"
 
 # libnautilus-private/nautilus-file.c:2965
-#: ../libnautilus-private/nautilus-file.c:6468
-#: ../libnautilus-private/nautilus-file.c:6476
-#: ../libnautilus-private/nautilus-file.c:6527
+#: ../src/nautilus-file.c:6455 ../src/nautilus-file.c:6463
+#: ../src/nautilus-file.c:6514
 msgid "Program"
 msgstr "Programa"
 
-#: ../libnautilus-private/nautilus-file.c:6469
+#: ../src/nautilus-file.c:6456
 msgid "Audio"
 msgstr "Sonido"
 
-#: ../libnautilus-private/nautilus-file.c:6470
+#: ../src/nautilus-file.c:6457
 msgid "Font"
 msgstr "Tipografía"
 
-#: ../libnautilus-private/nautilus-file.c:6471
-#: ../src/nautilus-image-properties-page.c:769
+#: ../src/nautilus-file.c:6458 ../src/nautilus-image-properties-page.c:768
 msgid "Image"
 msgstr "Imagen"
 
-#: ../libnautilus-private/nautilus-file.c:6472
+#: ../src/nautilus-file.c:6459
 msgid "Archive"
 msgstr "Archivador"
 
-#: ../libnautilus-private/nautilus-file.c:6473
+#: ../src/nautilus-file.c:6460
 msgid "Markup"
 msgstr "Marcado"
 
-#: ../libnautilus-private/nautilus-file.c:6474
-#: ../libnautilus-private/nautilus-file.c:6475
+#: ../src/nautilus-file.c:6461 ../src/nautilus-file.c:6462
 msgid "Text"
 msgstr "Texto"
 
-#: ../libnautilus-private/nautilus-file.c:6477
-#: ../src/nautilus-mime-actions.c:216
+#: ../src/nautilus-file.c:6464 ../src/nautilus-mime-actions.c:214
 msgid "Video"
 msgstr "Vídeo"
 
 # src/file-manager/fm-properties-window.c:878
-#: ../libnautilus-private/nautilus-file.c:6478
+#: ../src/nautilus-file.c:6465
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../libnautilus-private/nautilus-file.c:6479
+#: ../src/nautilus-file.c:6466
 msgid "Calendar"
 msgstr "Calendario"
 
 # src/file-manager/fm-directory-view.c:1865
-#: ../libnautilus-private/nautilus-file.c:6480
+#: ../src/nautilus-file.c:6467
 msgid "Document"
 msgstr "Documento"
 
-#: ../libnautilus-private/nautilus-file.c:6481
-#: ../src/nautilus-mime-actions.c:186
+#: ../src/nautilus-file.c:6468 ../src/nautilus-mime-actions.c:184
 msgid "Presentation"
 msgstr "Presentación"
 
-#: ../libnautilus-private/nautilus-file.c:6482
-#: ../src/nautilus-mime-actions.c:195
+#: ../src/nautilus-file.c:6469 ../src/nautilus-mime-actions.c:193
 msgid "Spreadsheet"
 msgstr "Hoja de cálculo"
 
-#: ../libnautilus-private/nautilus-file.c:6529
+#: ../src/nautilus-file.c:6516
 msgid "Binary"
 msgstr "Binario"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../libnautilus-private/nautilus-file.c:6533
+#: ../src/nautilus-file.c:6520
 msgid "Folder"
 msgstr "Carpeta"
 
-#: ../libnautilus-private/nautilus-file.c:6564
+#: ../src/nautilus-file.c:6551
 msgid "Link"
 msgstr "Enlace"
 
@@ -1337,25 +1318,23 @@ msgstr "Enlace"
 #. * to that kind of file (e.g. "link to folder").
 #.
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file.c:6570
-#: ../libnautilus-private/nautilus-file-operations.c:377
-#: ../src/nautilus-files-view-dnd.c:125
+#: ../src/nautilus-file.c:6557 ../src/nautilus-file-operations.c:378
+#: ../src/nautilus-files-view-dnd.c:124
 #, c-format
 msgid "Link to %s"
 msgstr "Enlace hacia %s"
 
-#: ../libnautilus-private/nautilus-file.c:6586
-#: ../libnautilus-private/nautilus-file.c:6600
+#: ../src/nautilus-file.c:6573 ../src/nautilus-file.c:6587
 msgid "Link (broken)"
 msgstr "Enlace (roto)"
 
 # libnautilus-private/nautilus-global-preferences.c:727
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:141
+#: ../src/nautilus-file-conflict-dialog.c:140
 #, c-format
 msgid "Merge folder “%s”?"
 msgstr "¿Mezclar la carpeta «%s»?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:145
+#: ../src/nautilus-file-conflict-dialog.c:144
 msgid ""
 "Merging will ask for confirmation before replacing any files in the folder "
 "that conflict with the files being copied."
@@ -1363,190 +1342,223 @@ msgstr ""
 "Mezclarlas pedirá confirmación antes de reemplazar cualquier archivo en la "
 "carpeta que esté en conflicto con los archivos que se están copiando."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:150
+#: ../src/nautilus-file-conflict-dialog.c:149
 #, c-format
 msgid "An older folder with the same name already exists in “%s”."
 msgstr "Existe una carpeta más antigua con el mismo nombre en «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:154
+#: ../src/nautilus-file-conflict-dialog.c:153
 #, c-format
 msgid "A newer folder with the same name already exists in “%s”."
 msgstr "Existe una carpeta más nueva con el mismo nombre en «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:158
+#: ../src/nautilus-file-conflict-dialog.c:157
 #, c-format
 msgid "Another folder with the same name already exists in “%s”."
 msgstr "Ya existe una carpeta con el mismo nombre en «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:163
+#: ../src/nautilus-file-conflict-dialog.c:162
 msgid "Replacing it will remove all files in the folder."
 msgstr "Reemplazarla eliminará todos los archivos en la carpeta."
 
 # libnautilus-private/nautilus-global-preferences.c:727
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:165
+#: ../src/nautilus-file-conflict-dialog.c:164
 #, c-format
 msgid "Replace folder “%s”?"
 msgstr "¿Reemplazar la carpeta «%s»?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:167
+#: ../src/nautilus-file-conflict-dialog.c:166
 #, c-format
 msgid "A folder with the same name already exists in “%s”."
 msgstr "Ya existe una carpeta con el mismo nombre en «%s»."
 
 # libnautilus-private/nautilus-global-preferences.c:727
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:172
+#: ../src/nautilus-file-conflict-dialog.c:171
 #, c-format
 msgid "Replace file “%s”?"
 msgstr "¿Reemplazar el archivo «%s»?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
+#: ../src/nautilus-file-conflict-dialog.c:173
 msgid "Replacing it will overwrite its content."
 msgstr "Reemplazarlo sobrescribirá su contenido."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:178
+#: ../src/nautilus-file-conflict-dialog.c:177
 #, c-format
 msgid "An older file with the same name already exists in “%s”."
 msgstr "Existe un archivo más antiguo con el mismo nombre en «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:182
+#: ../src/nautilus-file-conflict-dialog.c:181
 #, c-format
 msgid "A newer file with the same name already exists in “%s”."
 msgstr "Existe un archivo más nuevo con el mismo nombre en «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:186
+#: ../src/nautilus-file-conflict-dialog.c:185
 #, c-format
 msgid "Another file with the same name already exists in “%s”."
 msgstr "Ya existe otro archivo con el mismo nombre en «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:254
+#: ../src/nautilus-file-conflict-dialog.c:254
+#| msgid "Original file"
+msgid "Original folder"
+msgstr "Carpeta original"
+
+# libnautilus-private/nautilus-file.c:2585
+#: ../src/nautilus-file-conflict-dialog.c:255
+#: ../src/nautilus-file-conflict-dialog.c:292
+#| msgid "? items"
+msgid "Items:"
+msgstr "Elementos:"
+
+#: ../src/nautilus-file-conflict-dialog.c:258
 msgid "Original file"
 msgstr "Archivo original"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1100
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:255
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:286
-#: ../src/nautilus-properties-window.c:2996
+#: ../src/nautilus-file-conflict-dialog.c:259
+#: ../src/nautilus-file-conflict-dialog.c:296
+#: ../src/nautilus-properties-window.c:2959
 msgid "Size:"
 msgstr "Tamaño:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1094
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:258
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:289
-#: ../src/nautilus-properties-window.c:2978
+#: ../src/nautilus-file-conflict-dialog.c:263
+#: ../src/nautilus-file-conflict-dialog.c:300
+#: ../src/nautilus-properties-window.c:2941
 msgid "Type:"
 msgstr "Tipo:"
 
 # src/file-manager/fm-list-view.c:1599
 # src/file-manager/fm-search-list-view.c:158
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:261
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:292
+#: ../src/nautilus-file-conflict-dialog.c:266
+#: ../src/nautilus-file-conflict-dialog.c:303
 msgid "Last modified:"
 msgstr "Última modificación:"
 
+# libnautilus-private/nautilus-program-chooser.c:1344
+#: ../src/nautilus-file-conflict-dialog.c:291
+#| msgid "Merge"
+msgid "Merge with"
+msgstr "Mezclar con"
+
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:285
+#: ../src/nautilus-file-conflict-dialog.c:291
+#: ../src/nautilus-file-conflict-dialog.c:295
 msgid "Replace with"
 msgstr "Reemplazar con"
 
 # libnautilus-private/nautilus-program-chooser.c:1344
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:314
+#: ../src/nautilus-file-conflict-dialog.c:325
 msgid "Merge"
 msgstr "Mezclar"
 
 # src/nautilus-property-browser.c:875
 #. Setup the expander for the rename action
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:507
+#: ../src/nautilus-file-conflict-dialog.c:518
 msgid "_Select a new name for the destination"
 msgstr "_Seleccionar un nombre nuevo para el destino"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:521
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:317
+#: ../src/nautilus-file-conflict-dialog.c:532
+#: ../src/nautilus-mime-application-chooser.c:316
 msgid "Reset"
 msgstr "Restablecer"
 
 # src/file-manager/fm-properties-window.c:1641
 #. Setup the checkbox to apply the action to all files
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:533
-msgid "Apply this action to all files"
-msgstr "Aplicar esta acción a todos los archivos"
+#: ../src/nautilus-file-conflict-dialog.c:544
+#| msgid "Apply this action to all files"
+msgid "Apply this action to all files and folders"
+msgstr "Aplicar esta acción a todos los archivos y carpetas"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:544
-#: ../libnautilus-private/nautilus-file-operations.c:184
+#: ../src/nautilus-file-conflict-dialog.c:556
+#: ../src/nautilus-file-operations.c:180
 msgid "_Skip"
 msgstr "_Omitir"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:549
+#: ../src/nautilus-file-conflict-dialog.c:561
 msgid "Re_name"
 msgstr "Re_nombrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:555
+#: ../src/nautilus-file-conflict-dialog.c:567
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:629
+# src/file-manager/fm-directory-view.c:2140
+# src/file-manager/fm-directory-view.c:2257
+#: ../src/nautilus-file-conflict-dialog.c:650
+#| msgid "New Folder"
+msgid "Merge Folder"
+msgstr "Mezclar carpeta"
+
+#: ../src/nautilus-file-conflict-dialog.c:650
+#: ../src/nautilus-file-conflict-dialog.c:656
+#| msgid "File conflict"
+msgid "File and Folder conflict"
+msgstr "Conflicto de archivos y carpetas"
+
+#: ../src/nautilus-file-conflict-dialog.c:656
 msgid "File conflict"
 msgstr "Conflicto de archivo"
 
-#: ../libnautilus-private/nautilus-file-operations.c:185
+#: ../src/nautilus-file-operations.c:181
 msgid "S_kip All"
 msgstr "Omitir to_do"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:372
-#: ../libnautilus-private/nautilus-file-operations.c:186
+#: ../src/nautilus-file-operations.c:182
 msgid "_Retry"
 msgstr "_Reintentar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: ../libnautilus-private/nautilus-file-operations.c:187
+#: ../src/nautilus-file-operations.c:183
 msgid "_Delete"
 msgstr "_Eliminar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: ../libnautilus-private/nautilus-file-operations.c:188
+#: ../src/nautilus-file-operations.c:184
 msgid "Delete _All"
 msgstr "Eliminar _todo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: ../libnautilus-private/nautilus-file-operations.c:189
+#: ../src/nautilus-file-operations.c:185
 msgid "_Replace"
 msgstr "_Reemplazar"
 
 # src/file-manager/dfos-xfer.c:430
-#: ../libnautilus-private/nautilus-file-operations.c:190
+#: ../src/nautilus-file-operations.c:186
 msgid "Replace _All"
 msgstr "Reemplazar _todo"
 
 # libnautilus-private/nautilus-program-chooser.c:1344
-#: ../libnautilus-private/nautilus-file-operations.c:191
+#: ../src/nautilus-file-operations.c:187
 msgid "_Merge"
 msgstr "_Mezclar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: ../libnautilus-private/nautilus-file-operations.c:192
+#: ../src/nautilus-file-operations.c:188
 msgid "Merge _All"
 msgstr "Mezclar _todo"
 
-#: ../libnautilus-private/nautilus-file-operations.c:193
+#: ../src/nautilus-file-operations.c:189
 msgid "Copy _Anyway"
 msgstr "Copiar de todas _formas"
 
-#: ../libnautilus-private/nautilus-file-operations.c:278
+#: ../src/nautilus-file-operations.c:279
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
@@ -1554,22 +1566,21 @@ msgstr[0] "%'d segundo"
 msgstr[1] "%'d segundos"
 
 # libnautilus-private/nautilus-file.c:2594
-#: ../libnautilus-private/nautilus-file-operations.c:283
-#: ../libnautilus-private/nautilus-file-operations.c:294
+#: ../src/nautilus-file-operations.c:284 ../src/nautilus-file-operations.c:295
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d minuto"
 msgstr[1] "%'d minutos"
 
-#: ../libnautilus-private/nautilus-file-operations.c:293
+#: ../src/nautilus-file-operations.c:294
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d hora"
 msgstr[1] "%'d horas"
 
-#: ../libnautilus-private/nautilus-file-operations.c:301
+#: ../src/nautilus-file-operations.c:302
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -1577,7 +1588,7 @@ msgstr[0] "%'d hora aproximadamente"
 msgstr[1] "%'d horas aproximadamente"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:381
+#: ../src/nautilus-file-operations.c:382
 #, c-format
 msgid "Another link to %s"
 msgstr "Otro enlace hacia %s"
@@ -1586,25 +1597,25 @@ msgstr "Otro enlace hacia %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:397
+#: ../src/nautilus-file-operations.c:398
 #, c-format
 msgid "%'dst link to %s"
 msgstr "%'der enlace hacia %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:401
+#: ../src/nautilus-file-operations.c:402
 #, c-format
 msgid "%'dnd link to %s"
 msgstr "%'dº enlace hacia %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:405
+#: ../src/nautilus-file-operations.c:406
 #, c-format
 msgid "%'drd link to %s"
 msgstr "%'der enlace hacia %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:409
+#: ../src/nautilus-file-operations.c:410
 #, c-format
 msgid "%'dth link to %s"
 msgstr "%'dº enlace hacia %s"
@@ -1614,12 +1625,12 @@ msgstr "%'dº enlace hacia %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:448
+#: ../src/nautilus-file-operations.c:449
 msgid " (copy)"
 msgstr " (copiar)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:450
+#: ../src/nautilus-file-operations.c:451
 msgid " (another copy)"
 msgstr " (otra copia)"
 
@@ -1627,36 +1638,34 @@ msgstr " (otra copia)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:453
-#: ../libnautilus-private/nautilus-file-operations.c:455
-#: ../libnautilus-private/nautilus-file-operations.c:457
-#: ../libnautilus-private/nautilus-file-operations.c:467
+#: ../src/nautilus-file-operations.c:454 ../src/nautilus-file-operations.c:456
+#: ../src/nautilus-file-operations.c:458 ../src/nautilus-file-operations.c:468
 msgid "th copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:460
+#: ../src/nautilus-file-operations.c:461
 msgid "st copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:462
+#: ../src/nautilus-file-operations.c:463
 msgid "nd copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:464
+#: ../src/nautilus-file-operations.c:465
 msgid "rd copy)"
 msgstr "ª copia)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:481
+#: ../src/nautilus-file-operations.c:482
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copia)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:483
+#: ../src/nautilus-file-operations.c:484
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (otra copia)%s"
@@ -1665,10 +1674,8 @@ msgstr "%s (otra copia)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:486
-#: ../libnautilus-private/nautilus-file-operations.c:488
-#: ../libnautilus-private/nautilus-file-operations.c:490
-#: ../libnautilus-private/nautilus-file-operations.c:504
+#: ../src/nautilus-file-operations.c:487 ../src/nautilus-file-operations.c:489
+#: ../src/nautilus-file-operations.c:491 ../src/nautilus-file-operations.c:505
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr "%s (%'dª copia)%s"
@@ -1678,42 +1685,42 @@ msgstr "%s (%'dª copia)%s"
 #. * strings look like "%s (copy %'d)%s".
 #.
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:498
+#: ../src/nautilus-file-operations.c:499
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr "%s (%'dª copia)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:500
+#: ../src/nautilus-file-operations.c:501
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr "%s (%'dª copia)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:502
+#: ../src/nautilus-file-operations.c:503
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr "%s (%'dª copia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:603
+#: ../src/nautilus-file-operations.c:604
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:611
+#: ../src/nautilus-file-operations.c:612
 #, c-format
 msgid " (%'d"
 msgstr " (%'d"
 
 # src/file-manager/fm-directory-view.c:1855
-#: ../libnautilus-private/nautilus-file-operations.c:1359
+#: ../src/nautilus-file-operations.c:1385
 msgid "Are you sure you want to permanently delete “%B” from the trash?"
 msgstr ""
 "¿Está seguro de que quiere eliminar permanentemente a «%B» de la papelera?"
 
 # src/file-manager/fm-directory-view.c:1860
-#: ../libnautilus-private/nautilus-file-operations.c:1362
+#: ../src/nautilus-file-operations.c:1388
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -1728,34 +1735,33 @@ msgstr[1] ""
 "¿Está seguro de que quiere eliminar permanentemente los %'d elementos "
 "seleccionados de la papelera?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1372
-#: ../libnautilus-private/nautilus-file-operations.c:1438
+#: ../src/nautilus-file-operations.c:1398
+#: ../src/nautilus-file-operations.c:1464
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Si elimina un elemento, se perderá para siempre."
 
 # src/file-manager/fm-directory-view.c:2669
-#: ../libnautilus-private/nautilus-file-operations.c:1392
+#: ../src/nautilus-file-operations.c:1418
 msgid "Empty all items from Trash?"
 msgstr "¿Vaciar todos los elementos en la papelera?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1396
+#: ../src/nautilus-file-operations.c:1422
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Se eliminarán permanentemente todos los elementos en la papelera."
 
 # src/file-manager/fm-directory-view.c:2154
-#: ../libnautilus-private/nautilus-file-operations.c:1399
-#: ../libnautilus-private/nautilus-file-operations.c:2482
-#: ../src/nautilus-window.c:1208
+#: ../src/nautilus-file-operations.c:1425
+#: ../src/nautilus-file-operations.c:2502 ../src/nautilus-window.c:1359
 msgid "Empty _Trash"
 msgstr "Vaciar la _papelera"
 
 # src/file-manager/fm-directory-view.c:1855
-#: ../libnautilus-private/nautilus-file-operations.c:1426
+#: ../src/nautilus-file-operations.c:1452
 msgid "Are you sure you want to permanently delete “%B”?"
 msgstr "¿Está seguro de que quiere eliminar permanentemente «%B»?"
 
 # src/file-manager/fm-directory-view.c:1860
-#: ../libnautilus-private/nautilus-file-operations.c:1429
+#: ../src/nautilus-file-operations.c:1455
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -1768,17 +1774,17 @@ msgstr[1] ""
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: ../libnautilus-private/nautilus-file-operations.c:1482
+#: ../src/nautilus-file-operations.c:1508
 msgid "Deleted “%B”"
 msgstr "«%B» eliminado"
 
 # src/file-manager/fm-icon-view.c:1277
-#: ../libnautilus-private/nautilus-file-operations.c:1484
+#: ../src/nautilus-file-operations.c:1510
 msgid "Deleting “%B”"
 msgstr "Eliminando «%B»"
 
 # src/file-manager/dfos-xfer.c:1008 src/file-manager/dfos-xfer.c:1058
-#: ../libnautilus-private/nautilus-file-operations.c:1492
+#: ../src/nautilus-file-operations.c:1518
 #, c-format
 msgid "Deleted %'d file"
 msgid_plural "Deleted %'d files"
@@ -1786,7 +1792,7 @@ msgstr[0] "Eliminado %'d archivo"
 msgstr[1] "Eliminados %'d archivos"
 
 # src/file-manager/dfos-xfer.c:1008 src/file-manager/dfos-xfer.c:1058
-#: ../libnautilus-private/nautilus-file-operations.c:1496
+#: ../src/nautilus-file-operations.c:1522
 #, c-format
 msgid "Deleting %'d file"
 msgid_plural "Deleting %'d files"
@@ -1795,15 +1801,15 @@ msgstr[1] "Eliminando %'d archivos"
 
 #. To translators: %'d is the number of files completed for the operation,
 #. * so it will be something like 2/14.
-#: ../libnautilus-private/nautilus-file-operations.c:1518
-#: ../libnautilus-private/nautilus-file-operations.c:1524
-#: ../libnautilus-private/nautilus-file-operations.c:1556
-#: ../libnautilus-private/nautilus-file-operations.c:1914
-#: ../libnautilus-private/nautilus-file-operations.c:1920
-#: ../libnautilus-private/nautilus-file-operations.c:1952
-#: ../libnautilus-private/nautilus-file-operations.c:3306
-#: ../libnautilus-private/nautilus-file-operations.c:3312
-#: ../libnautilus-private/nautilus-file-operations.c:3353
+#: ../src/nautilus-file-operations.c:1544
+#: ../src/nautilus-file-operations.c:1550
+#: ../src/nautilus-file-operations.c:1583
+#: ../src/nautilus-file-operations.c:1941
+#: ../src/nautilus-file-operations.c:1947
+#: ../src/nautilus-file-operations.c:1979
+#: ../src/nautilus-file-operations.c:3327
+#: ../src/nautilus-file-operations.c:3333
+#: ../src/nautilus-file-operations.c:3374
 #, c-format
 msgid "%'d / %'d"
 msgstr "%'d / %'d"
@@ -1813,16 +1819,16 @@ msgstr "%'d / %'d"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1539
-#: ../libnautilus-private/nautilus-file-operations.c:1935
+#: ../src/nautilus-file-operations.c:1565
+#: ../src/nautilus-file-operations.c:1962
 msgid "%'d / %'d — %T left"
 msgid_plural "%'d / %'d — %T left"
 msgstr[0] "%'d / %'d — queda %T"
 msgstr[1] "%'d / %'d — %T quedan (%S/sg)"
 
 # libnautilus-private/nautilus-file.c:2595
-#: ../libnautilus-private/nautilus-file-operations.c:1542
-#: ../libnautilus-private/nautilus-file-operations.c:1938
+#: ../src/nautilus-file-operations.c:1569
+#: ../src/nautilus-file-operations.c:1965
 #, c-format
 msgid "(%d file/sec)"
 msgid_plural "(%d files/sec)"
@@ -1830,15 +1836,15 @@ msgstr[0] "(%d archivo/sg)"
 msgstr[1] "(%d archivos/sg)"
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:1624
-#: ../libnautilus-private/nautilus-file-operations.c:1658
-#: ../libnautilus-private/nautilus-file-operations.c:1697
-#: ../libnautilus-private/nautilus-file-operations.c:1773
-#: ../libnautilus-private/nautilus-file-operations.c:2742
+#: ../src/nautilus-file-operations.c:1651
+#: ../src/nautilus-file-operations.c:1685
+#: ../src/nautilus-file-operations.c:1724
+#: ../src/nautilus-file-operations.c:1800
+#: ../src/nautilus-file-operations.c:2763
 msgid "Error while deleting."
 msgstr "Error al eliminar."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1628
+#: ../src/nautilus-file-operations.c:1655
 msgid ""
 "Files in the folder “%B” cannot be deleted because you do not have "
 "permissions to see them."
@@ -1846,9 +1852,9 @@ msgstr ""
 "Los archivos en la carpeta «%B» no se pueden eliminar porque no tiene "
 "permisos para verlos."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1631
-#: ../libnautilus-private/nautilus-file-operations.c:2801
-#: ../libnautilus-private/nautilus-file-operations.c:3993
+#: ../src/nautilus-file-operations.c:1658
+#: ../src/nautilus-file-operations.c:2822
+#: ../src/nautilus-file-operations.c:4014
 msgid ""
 "There was an error getting information about the files in the folder “%B”."
 msgstr ""
@@ -1858,50 +1864,50 @@ msgstr ""
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: ../libnautilus-private/nautilus-file-operations.c:1640
-#: ../libnautilus-private/nautilus-file-operations.c:4002
+#: ../src/nautilus-file-operations.c:1667
+#: ../src/nautilus-file-operations.c:4023
 msgid "_Skip files"
 msgstr "_Omitir archivos"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1661
+#: ../src/nautilus-file-operations.c:1688
 msgid ""
 "The folder “%B” cannot be deleted because you do not have permissions to "
 "read it."
 msgstr ""
 "La carpeta «%B» no se puede eliminar porque no tiene permisos para leerla."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1664
-#: ../libnautilus-private/nautilus-file-operations.c:2840
-#: ../libnautilus-private/nautilus-file-operations.c:4038
+#: ../src/nautilus-file-operations.c:1691
+#: ../src/nautilus-file-operations.c:2861
+#: ../src/nautilus-file-operations.c:4059
 msgid "There was an error reading the folder “%B”."
 msgstr "Hubo un error al leer la carpeta «%B»."
 
 # src/file-manager/dfos-xfer.c:778
-#: ../libnautilus-private/nautilus-file-operations.c:1698
+#: ../src/nautilus-file-operations.c:1725
 msgid "Could not remove the folder %B."
 msgstr "No se pudo eliminar la carpeta %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1774
+#: ../src/nautilus-file-operations.c:1801
 msgid "There was an error deleting %B."
 msgstr "Hubo un error al eliminar %B."
 
 # src/file-manager/fm-icon-view.c:1277
-#: ../libnautilus-private/nautilus-file-operations.c:1877
+#: ../src/nautilus-file-operations.c:1904
 msgid "Trashing “%B”"
 msgstr "Enviando «%B» a la papelera"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1879
+#: ../src/nautilus-file-operations.c:1906
 msgid "Trashed “%B”"
 msgstr "«%B» movido a la papelera"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1887
+#: ../src/nautilus-file-operations.c:1914
 #, c-format
 msgid "Trashing %'d file"
 msgid_plural "Trashing %'d files"
 msgstr[0] "Moviendo %'d archivo a la papelera"
 msgstr[1] "Moviendo %'d archivos a la papelera"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1891
+#: ../src/nautilus-file-operations.c:1918
 #, c-format
 msgid "Trashed %'d file"
 msgid_plural "Trashed %'d files"
@@ -1909,36 +1915,36 @@ msgstr[0] "Movido %'d archivo a la papelera"
 msgstr[1] "Movidos %'d archivos a la papelera"
 
 #. Translators: %B is a file name
-#: ../libnautilus-private/nautilus-file-operations.c:2014
+#: ../src/nautilus-file-operations.c:2041
 msgid "“%B” can't be put in the trash. Do you want to delete it immediately?"
 msgstr "No puede mover «%B» a la papelera. ¿Quiere eliminarlo inmediatamente?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2020
+#: ../src/nautilus-file-operations.c:2047
 msgid "This remote location does not support sending items to the trash."
 msgstr "Este lugar remoto no soporta el envío de elementos a la papelera."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2229
+#: ../src/nautilus-file-operations.c:2250
 msgid "Trashing Files"
 msgstr "Moviendo archivos a la papelera"
 
 # src/file-manager/dfos-xfer.c:1008 src/file-manager/dfos-xfer.c:1058
-#: ../libnautilus-private/nautilus-file-operations.c:2231
+#: ../src/nautilus-file-operations.c:2252
 msgid "Deleting Files"
 msgstr "Eliminando archivos"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2313
+#: ../src/nautilus-file-operations.c:2333
 msgid "Unable to eject %V"
 msgstr "No se pudo expulsar %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2315
+#: ../src/nautilus-file-operations.c:2335
 msgid "Unable to unmount %V"
 msgstr "No se pudo montar %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2472
+#: ../src/nautilus-file-operations.c:2492
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "¿Quiere vaciar la papelera antes de desmontar?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2474
+#: ../src/nautilus-file-operations.c:2494
 msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
@@ -1947,19 +1953,18 @@ msgstr ""
 "vaciarse. Todos los elementos de la papelera se perderán permanentemente."
 
 # src/file-manager/fm-directory-view.c:2154
-#: ../libnautilus-private/nautilus-file-operations.c:2480
+#: ../src/nautilus-file-operations.c:2500
 msgid "Do _not Empty Trash"
 msgstr "_No vaciar la papelera"
 
 #. Translators: %s is a file name formatted for display
-#: ../libnautilus-private/nautilus-file-operations.c:2613
-#: ../src/nautilus-files-view.c:5702
+#: ../src/nautilus-file-operations.c:2634 ../src/nautilus-files-view.c:5644
 #, c-format
 msgid "Unable to access “%s”"
 msgstr "No se puede acceder a «%s»"
 
 # src/file-manager/dfos-xfer.c:1009
-#: ../libnautilus-private/nautilus-file-operations.c:2689
+#: ../src/nautilus-file-operations.c:2710
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
@@ -1967,7 +1972,7 @@ msgstr[0] "Preparándose para copiar %'d archivo (%S)"
 msgstr[1] "Preparándose para copiar %'d archivos (%S)"
 
 # src/file-manager/dfos-xfer.c:1009
-#: ../libnautilus-private/nautilus-file-operations.c:2695
+#: ../src/nautilus-file-operations.c:2716
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
@@ -1975,7 +1980,7 @@ msgstr[0] "Preparándose para mover %'d archivo (%S)"
 msgstr[1] "Preparándose para mover %'d archivos (%S)"
 
 # src/file-manager/dfos-xfer.c:1009
-#: ../libnautilus-private/nautilus-file-operations.c:2701
+#: ../src/nautilus-file-operations.c:2722
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
@@ -1983,7 +1988,7 @@ msgstr[0] "Preparándose para eliminar %'d archivo (%S)"
 msgstr[1] "Preparándose para eliminar %'d archivos (%S)"
 
 # src/file-manager/dfos-xfer.c:1009
-#: ../libnautilus-private/nautilus-file-operations.c:2707
+#: ../src/nautilus-file-operations.c:2728
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
@@ -1991,26 +1996,26 @@ msgstr[0] "Preparándose para mover a la papelera %'d archivo"
 msgstr[1] "Preparándose para mover a la papelera %'d archivos"
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:2738
-#: ../libnautilus-private/nautilus-file-operations.c:3853
-#: ../libnautilus-private/nautilus-file-operations.c:3985
-#: ../libnautilus-private/nautilus-file-operations.c:4030
+#: ../src/nautilus-file-operations.c:2759
+#: ../src/nautilus-file-operations.c:3874
+#: ../src/nautilus-file-operations.c:4006
+#: ../src/nautilus-file-operations.c:4051
 msgid "Error while copying."
 msgstr "Error al copiar."
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:2740
-#: ../libnautilus-private/nautilus-file-operations.c:3983
-#: ../libnautilus-private/nautilus-file-operations.c:4028
+#: ../src/nautilus-file-operations.c:2761
+#: ../src/nautilus-file-operations.c:4004
+#: ../src/nautilus-file-operations.c:4049
 msgid "Error while moving."
 msgstr "Error al mover."
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:2744
+#: ../src/nautilus-file-operations.c:2765
 msgid "Error while moving files to trash."
 msgstr "Error al mover los archivos a la papelera."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2798
+#: ../src/nautilus-file-operations.c:2819
 msgid ""
 "Files in the folder “%B” cannot be handled because you do not have "
 "permissions to see them."
@@ -2018,14 +2023,14 @@ msgstr ""
 "Los archivos en la carpeta «%B» no se pueden gestionar porque no tiene "
 "permisos para verlos."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2837
+#: ../src/nautilus-file-operations.c:2858
 msgid ""
 "The folder “%B” cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
 "La carpeta «%B» no se puede gestionar porque no tiene permisos para leerla."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2914
+#: ../src/nautilus-file-operations.c:2935
 msgid ""
 "The file “%B” cannot be handled because you do not have permissions to read "
 "it."
@@ -2033,32 +2038,32 @@ msgstr ""
 "El archivo «%B» no se puede gestionar porque usted no tiene permisos para "
 "leerlo."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2917
+#: ../src/nautilus-file-operations.c:2938
 msgid "There was an error getting information about “%B”."
 msgstr "Hubo un error al obtener la información acerca de «%B»."
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:3019
-#: ../libnautilus-private/nautilus-file-operations.c:3067
-#: ../libnautilus-private/nautilus-file-operations.c:3106
-#: ../libnautilus-private/nautilus-file-operations.c:3136
+#: ../src/nautilus-file-operations.c:3040
+#: ../src/nautilus-file-operations.c:3088
+#: ../src/nautilus-file-operations.c:3127
+#: ../src/nautilus-file-operations.c:3157
 msgid "Error while copying to “%B”."
 msgstr "Error al copiar a «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3023
+#: ../src/nautilus-file-operations.c:3044
 msgid "You do not have permissions to access the destination folder."
 msgstr "No tiene permiso para acceder a la carpeta de destino."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3025
+#: ../src/nautilus-file-operations.c:3046
 msgid "There was an error getting information about the destination."
 msgstr "Hubo un error al obtener la información acerca del destino."
 
 # src/nautilus-window-menus.c:602
-#: ../libnautilus-private/nautilus-file-operations.c:3068
+#: ../src/nautilus-file-operations.c:3089
 msgid "The destination is not a folder."
 msgstr "El destino no es una carpeta."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3107
+#: ../src/nautilus-file-operations.c:3128
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
@@ -2066,80 +2071,80 @@ msgstr ""
 "No hay suficiente espacio en el destino. Pruebe a eliminar archivos para "
 "hacer espacio."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3109
+#: ../src/nautilus-file-operations.c:3130
 #, c-format
 msgid "%S more space is required to copy to the destination."
 msgstr "Se requiere %S espacio disponible adicional para copiar al destino."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3137
+#: ../src/nautilus-file-operations.c:3158
 msgid "The destination is read-only."
 msgstr "El destino es de sólo lectura."
 
 # src/file-manager/fm-error-reporting.c:214
-#: ../libnautilus-private/nautilus-file-operations.c:3202
+#: ../src/nautilus-file-operations.c:3223
 msgid "Moving “%B” to “%B”"
 msgstr "Moviendo «%B» a «%B»"
 
 # src/file-manager/fm-error-reporting.c:214
-#: ../libnautilus-private/nautilus-file-operations.c:3204
+#: ../src/nautilus-file-operations.c:3225
 msgid "Moved “%B” to “%B”"
 msgstr "Movido «%B» a «%B»"
 
 # src/file-manager/fm-error-reporting.c:214
-#: ../libnautilus-private/nautilus-file-operations.c:3208
+#: ../src/nautilus-file-operations.c:3229
 msgid "Copying “%B” to “%B”"
 msgstr "Copiando «%B» a «%B»"
 
 # src/file-manager/fm-error-reporting.c:214
-#: ../libnautilus-private/nautilus-file-operations.c:3210
+#: ../src/nautilus-file-operations.c:3231
 msgid "Copied “%B” to “%B”"
 msgstr "Copiado «%B» a «%B»"
 
 # src/file-manager/fm-icon-view.c:1277
-#: ../libnautilus-private/nautilus-file-operations.c:3221
+#: ../src/nautilus-file-operations.c:3242
 msgid "Duplicating “%B”"
 msgstr "Duplicando «%B»"
 
 # src/file-manager/fm-icon-view.c:1277
-#: ../libnautilus-private/nautilus-file-operations.c:3223
+#: ../src/nautilus-file-operations.c:3244
 msgid "Duplicated “%B”"
 msgstr "Duplicado «%B»"
 
 # src/file-manager/dfos-xfer.c:700
-#: ../libnautilus-private/nautilus-file-operations.c:3233
+#: ../src/nautilus-file-operations.c:3254
 msgid "Moving %'d file to “%B”"
 msgid_plural "Moving %'d files to “%B”"
 msgstr[0] "Moviendo %'d archivo a «%B»"
 msgstr[1] "Moviendo %'d archivos a «%B»"
 
 # src/file-manager/dfos-xfer.c:723
-#: ../libnautilus-private/nautilus-file-operations.c:3237
+#: ../src/nautilus-file-operations.c:3258
 msgid "Copying %'d file to “%B”"
 msgid_plural "Copying %'d files to “%B”"
 msgstr[0] "Copiando %'d archivo a «%B»"
 msgstr[1] "Copiando %'d archivos a «%B»"
 
 # src/file-manager/dfos-xfer.c:700
-#: ../libnautilus-private/nautilus-file-operations.c:3247
+#: ../src/nautilus-file-operations.c:3268
 msgid "Moved %'d file to “%B”"
 msgid_plural "Moved %'d files to “%B”"
 msgstr[0] "Movido %'d archivo a «%B»"
 msgstr[1] "Movidos %'d archivos a «%B»"
 
 # src/file-manager/dfos-xfer.c:723
-#: ../libnautilus-private/nautilus-file-operations.c:3251
+#: ../src/nautilus-file-operations.c:3272
 msgid "Copied %'d file to “%B”"
 msgid_plural "Copied %'d files to “%B”"
 msgstr[0] "Copiado %'d archivo a «%B»"
 msgstr[1] "Copiados %'d archivos a «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3265
+#: ../src/nautilus-file-operations.c:3286
 msgid "Duplicating %'d file in “%B”"
 msgid_plural "Duplicating %'d files in “%B”"
 msgstr[0] "Duplicando %'d archivo en «%B»"
 msgstr[1] "Duplicando %'d archivos en «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3273
+#: ../src/nautilus-file-operations.c:3294
 msgid "Duplicated %'d file in “%B”"
 msgid_plural "Duplicated %'d files in “%B”"
 msgstr[0] "Duplicado %'d archivo en «%B»"
@@ -2147,8 +2152,8 @@ msgstr[1] "Duplicados %'d archivos en «%B»"
 
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb / 4 MB"
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB".
-#: ../libnautilus-private/nautilus-file-operations.c:3301
-#: ../libnautilus-private/nautilus-file-operations.c:3333
+#: ../src/nautilus-file-operations.c:3322
+#: ../src/nautilus-file-operations.c:3354
 #, c-format
 msgid "%S / %S"
 msgstr "%S / %S"
@@ -2158,7 +2163,7 @@ msgstr "%S / %S"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:3325
+#: ../src/nautilus-file-operations.c:3346
 msgid "%S / %S — %T left (%S/sec)"
 msgid_plural "%S / %S — %T left (%S/sec)"
 msgstr[0] "%S / %S — %T queda (%S/sg)"
@@ -2169,13 +2174,13 @@ msgstr[1] "%S / %S — %T quedan (%S/sg)"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:3344
+#: ../src/nautilus-file-operations.c:3365
 msgid "%'d / %'d — %T left (%S/sec)"
 msgid_plural "%'d / %'d — %T left (%S/sec)"
 msgstr[0] "%'d / %'d — %T queda (%S/sg)"
 msgstr[1] "%'d / %'d — %T quedan (%S/sg)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3857
+#: ../src/nautilus-file-operations.c:3878
 msgid ""
 "The folder “%B” cannot be copied because you do not have permissions to "
 "create it in the destination."
@@ -2183,11 +2188,11 @@ msgstr ""
 "La carpeta «%B» no se puede copiar porque no tiene permisos para crearla en "
 "el destino."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3860
+#: ../src/nautilus-file-operations.c:3881
 msgid "There was an error creating the folder “%B”."
 msgstr "Hubo un error al crear la carpeta «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3990
+#: ../src/nautilus-file-operations.c:4011
 msgid ""
 "Files in the folder “%B” cannot be copied because you do not have "
 "permissions to see them."
@@ -2195,7 +2200,7 @@ msgstr ""
 "Los archivos en la carpeta «%B» no se pueden copiar porque no tiene permisos "
 "para verlos."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4035
+#: ../src/nautilus-file-operations.c:4056
 msgid ""
 "The folder “%B” cannot be copied because you do not have permissions to read "
 "it."
@@ -2203,117 +2208,117 @@ msgstr ""
 "La carpeta «%B» no se puede copiar porque no tiene permisos para leerla."
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:4080
-#: ../libnautilus-private/nautilus-file-operations.c:4782
-#: ../libnautilus-private/nautilus-file-operations.c:5402
+#: ../src/nautilus-file-operations.c:4101
+#: ../src/nautilus-file-operations.c:4830
+#: ../src/nautilus-file-operations.c:5444
 msgid "Error while moving “%B”."
 msgstr "Error al mover «%B»."
 
 # src/file-manager/dfos-xfer.c:778
-#: ../libnautilus-private/nautilus-file-operations.c:4081
+#: ../src/nautilus-file-operations.c:4102
 msgid "Could not remove the source folder."
 msgstr "No se pudo eliminar la carpeta origen."
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:4165
-#: ../libnautilus-private/nautilus-file-operations.c:4206
-#: ../libnautilus-private/nautilus-file-operations.c:4784
-#: ../libnautilus-private/nautilus-file-operations.c:4855
+#: ../src/nautilus-file-operations.c:4186
+#: ../src/nautilus-file-operations.c:4227
+#: ../src/nautilus-file-operations.c:4832
+#: ../src/nautilus-file-operations.c:4903
 msgid "Error while copying “%B”."
 msgstr "Error al copiar «%B»."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: ../libnautilus-private/nautilus-file-operations.c:4166
+#: ../src/nautilus-file-operations.c:4187
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr "No se pudieron eliminar los archivos de la carpeta ya existente %F."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: ../libnautilus-private/nautilus-file-operations.c:4207
+#: ../src/nautilus-file-operations.c:4228
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr "No se pudo eliminar el archivo ya existente %F."
 
 # src/file-manager/dfos-xfer.c:744
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:4527
-#: ../libnautilus-private/nautilus-file-operations.c:5245
+#: ../src/nautilus-file-operations.c:4575
+#: ../src/nautilus-file-operations.c:5287
 msgid "You cannot move a folder into itself."
 msgstr "No puede mover una carpeta dentro de ella misma."
 
 # src/file-manager/dfos-xfer.c:778
-#: ../libnautilus-private/nautilus-file-operations.c:4528
-#: ../libnautilus-private/nautilus-file-operations.c:5246
+#: ../src/nautilus-file-operations.c:4576
+#: ../src/nautilus-file-operations.c:5288
 msgid "You cannot copy a folder into itself."
 msgstr "No puede copiar una carpeta dentro de ella misma."
 
 # src/nautilus-window-menus.c:602
-#: ../libnautilus-private/nautilus-file-operations.c:4529
-#: ../libnautilus-private/nautilus-file-operations.c:5247
+#: ../src/nautilus-file-operations.c:4577
+#: ../src/nautilus-file-operations.c:5289
 msgid "The destination folder is inside the source folder."
 msgstr "La carpeta de destino está dentro de la carpeta de origen."
 
 # src/file-manager/dfos-xfer.c:744
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:4559
+#: ../src/nautilus-file-operations.c:4607
 msgid "You cannot move a file over itself."
 msgstr "No puede mover un archivo sobre sí mismo."
 
 # src/file-manager/dfos-xfer.c:778
-#: ../libnautilus-private/nautilus-file-operations.c:4560
+#: ../src/nautilus-file-operations.c:4608
 msgid "You cannot copy a file over itself."
 msgstr "No puede copiar un archivo sobre sí mismo."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4561
+#: ../src/nautilus-file-operations.c:4609
 msgid "The source file would be overwritten by the destination."
 msgstr "El archivo de origen se sobrescribirá por el de destino."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: ../libnautilus-private/nautilus-file-operations.c:4786
+#: ../src/nautilus-file-operations.c:4834
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr "No se pudo eliminar el archivo ya existente con el mismo nombre en %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4856
+#: ../src/nautilus-file-operations.c:4904
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr "Hubo un error al copiar el archivo en %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5090
-#: ../libnautilus-private/nautilus-file-operations.c:5127
+#: ../src/nautilus-file-operations.c:5133
+#: ../src/nautilus-file-operations.c:5170
 msgid "Copying Files"
 msgstr "Copiando archivos"
 
 # src/file-manager/dfos-xfer.c:964
-#: ../libnautilus-private/nautilus-file-operations.c:5155
+#: ../src/nautilus-file-operations.c:5197
 msgid "Preparing to move to “%B”"
 msgstr "Preparándose para mover a «%B»"
 
 # src/file-manager/dfos-xfer.c:1009
-#: ../libnautilus-private/nautilus-file-operations.c:5159
+#: ../src/nautilus-file-operations.c:5201
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] "Preparándose para mover %'d archivo"
 msgstr[1] "Preparándose para mover %'d archivos"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5403
+#: ../src/nautilus-file-operations.c:5445
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "Hubo un error al mover el archivo a %F."
 
 # src/file-manager/dfos-xfer.c:961
-#: ../libnautilus-private/nautilus-file-operations.c:5668
+#: ../src/nautilus-file-operations.c:5705
 msgid "Moving Files"
 msgstr "Moviendo archivos"
 
 # src/file-manager/dfos-xfer.c:713
-#: ../libnautilus-private/nautilus-file-operations.c:5703
+#: ../src/nautilus-file-operations.c:5739
 msgid "Creating links in “%B”"
 msgstr "Creando enlaces en «%B»"
 
 # src/file-manager/dfos-xfer.c:713
-#: ../libnautilus-private/nautilus-file-operations.c:5707
+#: ../src/nautilus-file-operations.c:5743
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
@@ -2321,103 +2326,95 @@ msgstr[0] "Creando enlace hacia %'d archivo"
 msgstr[1] "Creando enlaces hacia %'d archivos"
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:5842
+#: ../src/nautilus-file-operations.c:5878
 msgid "Error while creating link to %B."
 msgstr "Error al crear el enlace hacia %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5844
+#: ../src/nautilus-file-operations.c:5880
 msgid "Symbolic links only supported for local files"
 msgstr "Los enlaces simbólicos sólo están soportados para archivos locales"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5847
+#: ../src/nautilus-file-operations.c:5883
 msgid "The target doesn't support symbolic links."
 msgstr "El destino no soporta enlaces simbólicos."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5850
+#: ../src/nautilus-file-operations.c:5886
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr "Hubo un error al crear el enlace simbólico en %F."
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../libnautilus-private/nautilus-file-operations.c:6181
+#: ../src/nautilus-file-operations.c:6212
 msgid "Setting permissions"
 msgstr "Establecido permisos"
 
 # src/nautilus-window-manage-views.c:173
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:6446
+#: ../src/nautilus-file-operations.c:6471
 msgid "Untitled Folder"
 msgstr "Carpeta sin título"
 
-# src/nautilus-window-manage-views.c:173
-#. localizers: the initial name of a new template document
-#: ../libnautilus-private/nautilus-file-operations.c:6452
-#, c-format
-msgid "Untitled %s"
-msgstr "Sin título %s"
-
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
 #. localizers: the initial name of a new empty document
-#: ../libnautilus-private/nautilus-file-operations.c:6458
+#: ../src/nautilus-file-operations.c:6483
 msgid "Untitled Document"
 msgstr "Documento sin título"
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:6674
+#: ../src/nautilus-file-operations.c:6699
 msgid "Error while creating directory %B."
 msgstr "Error al crear la carpeta %B."
 
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-file-operations.c:6676
+#: ../src/nautilus-file-operations.c:6701
 msgid "Error while creating file %B."
 msgstr "Error al crear el archivo %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6678
+#: ../src/nautilus-file-operations.c:6703
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr "Hubo un error al crear la carpeta en %F."
 
 # src/file-manager/fm-directory-view.c:2154
-#: ../libnautilus-private/nautilus-file-operations.c:6949
+#: ../src/nautilus-file-operations.c:6963
 msgid "Emptying Trash"
 msgstr "Vaciando la papelera"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6997
-#: ../libnautilus-private/nautilus-file-operations.c:7038
-#: ../libnautilus-private/nautilus-file-operations.c:7073
-#: ../libnautilus-private/nautilus-file-operations.c:7108
+#: ../src/nautilus-file-operations.c:7011
+#: ../src/nautilus-file-operations.c:7052
+#: ../src/nautilus-file-operations.c:7087
+#: ../src/nautilus-file-operations.c:7122
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "No se puede marcar el lanzador confiado (ejecutable)"
 
 # src/nautilus-first-time-druid.c:290
-#: ../libnautilus-private/nautilus-file-undo-operations.c:133
-#: ../src/nautilus-window.c:461 ../src/resources/ui/nautilus-window.ui.h:2
+#: ../src/nautilus-file-undo-operations.c:141 ../src/nautilus-window.c:463
+#: ../src/resources/ui/nautilus-window.ui.h:2
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:136
+#: ../src/nautilus-file-undo-operations.c:144
 msgid "Undo last action"
 msgstr "Deshacer la última acción"
 
 # src/file-manager/fm-properties-window.c:1573
-#: ../libnautilus-private/nautilus-file-undo-operations.c:140
-#: ../src/nautilus-window.c:462
+#: ../src/nautilus-file-undo-operations.c:148 ../src/nautilus-window.c:464
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:143
+#: ../src/nautilus-file-undo-operations.c:151
 msgid "Redo last undone action"
 msgstr "Rehacer la última acción deshecha"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:365
+#: ../src/nautilus-file-undo-operations.c:374
 #, c-format
 msgid "Move %d item back to '%s'"
 msgid_plural "Move %d items back to '%s'"
 msgstr[0] "Devolver %d elemento a «%s»"
 msgstr[1] "Devolver %d elementos a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:368
+#: ../src/nautilus-file-undo-operations.c:377
 #, c-format
 msgid "Move %d item to '%s'"
 msgid_plural "Move %d items to '%s'"
@@ -2425,7 +2422,7 @@ msgstr[0] "Mover %d elemento a «%s»"
 msgstr[1] "Mover %d elementos a «%s»"
 
 # libnautilus-private/nautilus-undo-signal-handlers.c:176
-#: ../libnautilus-private/nautilus-file-undo-operations.c:372
+#: ../src/nautilus-file-undo-operations.c:381
 #, c-format
 msgid "_Undo Move %d item"
 msgid_plural "_Undo Move %d items"
@@ -2433,44 +2430,44 @@ msgstr[0] "_Deshacer mover %d elemento"
 msgstr[1] "_Deshacer mover %d elementos"
 
 # libnautilus-private/nautilus-undo-signal-handlers.c:178
-#: ../libnautilus-private/nautilus-file-undo-operations.c:375
+#: ../src/nautilus-file-undo-operations.c:384
 #, c-format
 msgid "_Redo Move %d item"
 msgid_plural "_Redo Move %d items"
 msgstr[0] "_Rehacer mover %d elemento"
 msgstr[1] "_Rehacer mover %d elementos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:379
+#: ../src/nautilus-file-undo-operations.c:388
 #, c-format
 msgid "Move '%s' back to '%s'"
 msgstr "Devolver «%s» a «%s»"
 
 # src/file-manager/fm-directory-view.c:2145
-#: ../libnautilus-private/nautilus-file-undo-operations.c:380
+#: ../src/nautilus-file-undo-operations.c:389
 #, c-format
 msgid "Move '%s' to '%s'"
 msgstr "Mover «%s» a «%s»"
 
 # src/nautilus-first-time-druid.c:290
-#: ../libnautilus-private/nautilus-file-undo-operations.c:382
+#: ../src/nautilus-file-undo-operations.c:391
 msgid "_Undo Move"
 msgstr "_Deshacer mover"
 
 # src/file-manager/fm-properties-window.c:1573
-#: ../libnautilus-private/nautilus-file-undo-operations.c:383
+#: ../src/nautilus-file-undo-operations.c:392
 msgid "_Redo Move"
 msgstr "_Rehacer mover"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:386
+#: ../src/nautilus-file-undo-operations.c:395
 msgid "_Undo Restore from Trash"
 msgstr "_Deshacer restaurar desde la papelera"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:387
+#: ../src/nautilus-file-undo-operations.c:396
 msgid "_Redo Restore from Trash"
 msgstr "_Rehacer restaurar desde la papelera"
 
 # src/file-manager/dfos-xfer.c:961
-#: ../libnautilus-private/nautilus-file-undo-operations.c:390
+#: ../src/nautilus-file-undo-operations.c:399
 #, c-format
 msgid "Move %d item back to trash"
 msgid_plural "Move %d items back to trash"
@@ -2478,8 +2475,8 @@ msgstr[0] "Devolver %d elemento a la papelera"
 msgstr[1] "Devolver %d elementos a la papelera"
 
 # src/file-manager/fm-directory-view.c:2669
-#: ../libnautilus-private/nautilus-file-undo-operations.c:393
-#: ../libnautilus-private/nautilus-file-undo-operations.c:989
+#: ../src/nautilus-file-undo-operations.c:402
+#: ../src/nautilus-file-undo-operations.c:998
 #, c-format
 msgid "Restore %d item from trash"
 msgid_plural "Restore %d items from trash"
@@ -2487,38 +2484,38 @@ msgstr[0] "Restaurar %d elemento de la papelera"
 msgstr[1] "Restaurar %d elementos de la papelera"
 
 # src/file-manager/fm-directory-view.c:2145
-#: ../libnautilus-private/nautilus-file-undo-operations.c:397
+#: ../src/nautilus-file-undo-operations.c:406
 #, c-format
 msgid "Move '%s' back to trash"
 msgstr "Devolver «%s» a la papelera"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:398
+#: ../src/nautilus-file-undo-operations.c:407
 #, c-format
 msgid "Restore '%s' from trash"
 msgstr "Restaurar «%s» desde la papelera"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:402
+#: ../src/nautilus-file-undo-operations.c:411
 #, c-format
 msgid "Delete %d copied item"
 msgid_plural "Delete %d copied items"
 msgstr[0] "Eliminar %d elemento copiados"
 msgstr[1] "Eliminar %d elementos copiados"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:405
+#: ../src/nautilus-file-undo-operations.c:414
 #, c-format
 msgid "Copy %d item to '%s'"
 msgid_plural "Copy %d items to '%s'"
 msgstr[0] "Copiar %d elemento a «%s»"
 msgstr[1] "Copiar %d elementos a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:409
+#: ../src/nautilus-file-undo-operations.c:418
 #, c-format
 msgid "_Undo Copy %d item"
 msgid_plural "_Undo Copy %d items"
 msgstr[0] "_Deshacer copiar %d elemento"
 msgstr[1] "_Deshacer copiar %d elementos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:412
+#: ../src/nautilus-file-undo-operations.c:421
 #, c-format
 msgid "_Redo Copy %d item"
 msgid_plural "_Redo Copy %d items"
@@ -2527,29 +2524,29 @@ msgstr[1] "_Rehacer copiar %d elementos"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: ../libnautilus-private/nautilus-file-undo-operations.c:416
-#: ../libnautilus-private/nautilus-file-undo-operations.c:438
-#: ../libnautilus-private/nautilus-file-undo-operations.c:671
+#: ../src/nautilus-file-undo-operations.c:425
+#: ../src/nautilus-file-undo-operations.c:447
+#: ../src/nautilus-file-undo-operations.c:680
 #, c-format
 msgid "Delete '%s'"
 msgstr "Eliminar «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:417
+#: ../src/nautilus-file-undo-operations.c:426
 #, c-format
 msgid "Copy '%s' to '%s'"
 msgstr "Copiar «%s» a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:419
+#: ../src/nautilus-file-undo-operations.c:428
 msgid "_Undo Copy"
 msgstr "_Deshacer copiar"
 
 # src/file-manager/fm-properties-window.c:1573
-#: ../libnautilus-private/nautilus-file-undo-operations.c:420
+#: ../src/nautilus-file-undo-operations.c:429
 msgid "_Redo Copy"
 msgstr "_Rehacer copiar"
 
 # src/file-manager/fm-directory-view.c:2678
-#: ../libnautilus-private/nautilus-file-undo-operations.c:424
+#: ../src/nautilus-file-undo-operations.c:433
 #, c-format
 msgid "Delete %d duplicated item"
 msgid_plural "Delete %d duplicated items"
@@ -2557,7 +2554,7 @@ msgstr[0] "Eliminar %d elemento duplicados"
 msgstr[1] "Eliminar %d elementos duplicados"
 
 # src/file-manager/fm-directory-view.c:2148
-#: ../libnautilus-private/nautilus-file-undo-operations.c:427
+#: ../src/nautilus-file-undo-operations.c:436
 #, c-format
 msgid "Duplicate %d item in '%s'"
 msgid_plural "Duplicate %d items in '%s'"
@@ -2565,7 +2562,7 @@ msgstr[0] "Duplicar %d elemento en «%s»"
 msgstr[1] "Duplicar %d elementos en «%s»"
 
 # src/file-manager/fm-directory-view.c:2678
-#: ../libnautilus-private/nautilus-file-undo-operations.c:431
+#: ../src/nautilus-file-undo-operations.c:440
 #, c-format
 msgid "_Undo Duplicate %d item"
 msgid_plural "_Undo Duplicate %d items"
@@ -2573,7 +2570,7 @@ msgstr[0] "_Deshacer duplicar %d elemento"
 msgstr[1] "_Deshacer duplicar %d elementos"
 
 # src/file-manager/fm-directory-view.c:2678
-#: ../libnautilus-private/nautilus-file-undo-operations.c:434
+#: ../src/nautilus-file-undo-operations.c:443
 #, c-format
 msgid "_Redo Duplicate %d item"
 msgid_plural "_Redo Duplicate %d items"
@@ -2581,22 +2578,22 @@ msgstr[0] "_Rehacer duplicar %d elemento"
 msgstr[1] "_Rehacer duplicar %d elementos"
 
 # src/file-manager/fm-directory-view.c:2148
-#: ../libnautilus-private/nautilus-file-undo-operations.c:439
+#: ../src/nautilus-file-undo-operations.c:448
 #, c-format
 msgid "Duplicate '%s' in '%s'"
 msgstr "Duplicando «%s» en «%s»"
 
 # src/file-manager/fm-directory-view.c:2148
-#: ../libnautilus-private/nautilus-file-undo-operations.c:442
+#: ../src/nautilus-file-undo-operations.c:451
 msgid "_Undo Duplicate"
 msgstr "_Deshacer duplicar"
 
 # src/file-manager/fm-directory-view.c:2148
-#: ../libnautilus-private/nautilus-file-undo-operations.c:443
+#: ../src/nautilus-file-undo-operations.c:452
 msgid "_Redo Duplicate"
 msgstr "_Rehacer duplicar"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:447
+#: ../src/nautilus-file-undo-operations.c:456
 #, c-format
 msgid "Delete links to %d item"
 msgid_plural "Delete links to %d items"
@@ -2604,80 +2601,80 @@ msgstr[0] "Eliminar enlaces a %d elemento"
 msgstr[1] "Eliminar enlaces a %d elementos"
 
 # src/file-manager/dfos-xfer.c:713
-#: ../libnautilus-private/nautilus-file-undo-operations.c:450
+#: ../src/nautilus-file-undo-operations.c:459
 #, c-format
 msgid "Create links to %d item"
 msgid_plural "Create links to %d items"
 msgstr[0] "Crear enlaces a %d elemento"
 msgstr[1] "Crear enlaces a %d elementos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:454
+#: ../src/nautilus-file-undo-operations.c:463
 #, c-format
 msgid "Delete link to '%s'"
 msgstr "Eliminar enlace hacia «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:455
+#: ../src/nautilus-file-undo-operations.c:464
 #, c-format
 msgid "Create link to '%s'"
 msgstr "Crear enlace hacia «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:457
+#: ../src/nautilus-file-undo-operations.c:466
 msgid "_Undo Create Link"
 msgstr "_Deshacer crear enlace"
 
 # libnautilus-private/nautilus-undo-signal-handlers.c:178
-#: ../libnautilus-private/nautilus-file-undo-operations.c:458
+#: ../src/nautilus-file-undo-operations.c:467
 msgid "_Redo Create Link"
 msgstr "_Rehacer crear enlace"
 
 # src/file-manager/dfos-xfer.c:713
-#: ../libnautilus-private/nautilus-file-undo-operations.c:674
+#: ../src/nautilus-file-undo-operations.c:683
 #, c-format
 msgid "Create an empty file '%s'"
 msgstr "Crear un archivo «%s» vacío"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:676
+#: ../src/nautilus-file-undo-operations.c:685
 msgid "_Undo Create Empty File"
 msgstr "_Deshacer crear archivo vacío"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:677
+#: ../src/nautilus-file-undo-operations.c:686
 msgid "_Redo Create Empty File"
 msgstr "_Rehacer crear archivo vacío"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../libnautilus-private/nautilus-file-undo-operations.c:679
+#: ../src/nautilus-file-undo-operations.c:688
 #, c-format
 msgid "Create a new folder '%s'"
 msgstr "Crear una carpeta «%s» nueva"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../libnautilus-private/nautilus-file-undo-operations.c:681
+#: ../src/nautilus-file-undo-operations.c:690
 msgid "_Undo Create Folder"
 msgstr "_Deshacer crear carpeta"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../libnautilus-private/nautilus-file-undo-operations.c:682
+#: ../src/nautilus-file-undo-operations.c:691
 msgid "_Redo Create Folder"
 msgstr "_Rehacer crear carpeta"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:684
+#: ../src/nautilus-file-undo-operations.c:693
 #, c-format
 msgid "Create new file '%s' from template "
 msgstr "Crear un archivo nuevo «%s» a partir de la plantilla"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:686
+#: ../src/nautilus-file-undo-operations.c:695
 msgid "_Undo Create from Template"
 msgstr "_Deshacer crear desde plantilla"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:687
+#: ../src/nautilus-file-undo-operations.c:696
 msgid "_Redo Create from Template"
 msgstr "_Rehacer crear a partir de la plantilla"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:872
-#: ../libnautilus-private/nautilus-file-undo-operations.c:873
+#: ../src/nautilus-file-undo-operations.c:881
+#: ../src/nautilus-file-undo-operations.c:882
 #, c-format
 msgid "Rename '%s' as '%s'"
 msgstr "Renombrar «%s» como «%s»"
@@ -2685,206 +2682,262 @@ msgstr "Renombrar «%s» como «%s»"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
-#: ../libnautilus-private/nautilus-file-undo-operations.c:875
+#: ../src/nautilus-file-undo-operations.c:884
 msgid "_Undo Rename"
 msgstr "_Deshacer renombrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
-#: ../libnautilus-private/nautilus-file-undo-operations.c:876
+#: ../src/nautilus-file-undo-operations.c:885
 msgid "_Redo Rename"
 msgstr "_Rehacer renombrar"
 
 # src/file-manager/dfos-xfer.c:961
-#: ../libnautilus-private/nautilus-file-undo-operations.c:992
+#: ../src/nautilus-file-undo-operations.c:1001
 #, c-format
 msgid "Move %d item to trash"
 msgid_plural "Move %d items to trash"
 msgstr[0] "Mover %d elemento a la papelera"
 msgstr[1] "Mover %d elementos a la papelera"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1004
+#: ../src/nautilus-file-undo-operations.c:1013
 #, c-format
 msgid "Restore '%s' to '%s'"
 msgstr "Restaurar «%s» a «%s»"
 
 # src/file-manager/fm-directory-view.c:2145
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1011
+#: ../src/nautilus-file-undo-operations.c:1020
 #, c-format
 msgid "Move '%s' to trash"
 msgstr "Mover «%s» a la papelera"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1016
+#: ../src/nautilus-file-undo-operations.c:1025
 msgid "_Undo Trash"
 msgstr "_Deshacer mover a la papelera"
 
 # src/file-manager/fm-directory-view.c:2145
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1017
+#: ../src/nautilus-file-undo-operations.c:1026
 msgid "_Redo Trash"
 msgstr "_Rehacer mover a la papelera"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1310
+#: ../src/nautilus-file-undo-operations.c:1305
 #, c-format
 msgid "Restore original permissions of items enclosed in '%s'"
 msgstr "Restaurar los permisos originales de los elementos contenidos en «%s»"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1311
+#: ../src/nautilus-file-undo-operations.c:1306
 #, c-format
 msgid "Set permissions of items enclosed in '%s'"
 msgstr "Establecer los permisos de los elementos contenidos en «%s»"
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1313
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1464
+#: ../src/nautilus-file-undo-operations.c:1308
+#: ../src/nautilus-file-undo-operations.c:1459
 msgid "_Undo Change Permissions"
 msgstr "_Deshacer cambiar permisos"
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1314
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1465
+#: ../src/nautilus-file-undo-operations.c:1309
+#: ../src/nautilus-file-undo-operations.c:1460
 msgid "_Redo Change Permissions"
 msgstr "_Rehacer cambiar permisos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1461
+#: ../src/nautilus-file-undo-operations.c:1456
 #, c-format
 msgid "Restore original permissions of '%s'"
 msgstr "Restaurar los permisos originales de «%s»"
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1462
+#: ../src/nautilus-file-undo-operations.c:1457
 #, c-format
 msgid "Set permissions of '%s'"
 msgstr "Establecer los permisos de «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1572
+#: ../src/nautilus-file-undo-operations.c:1567
 #, c-format
 msgid "Restore group of '%s' to '%s'"
 msgstr "Restaurar el grupo de «%s» a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1574
+#: ../src/nautilus-file-undo-operations.c:1569
 #, c-format
 msgid "Set group of '%s' to '%s'"
 msgstr "Establecer el grupo de «%s» a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1577
+#: ../src/nautilus-file-undo-operations.c:1572
 msgid "_Undo Change Group"
 msgstr "_Deshacer cambiar grupo"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1578
+#: ../src/nautilus-file-undo-operations.c:1573
 msgid "_Redo Change Group"
 msgstr "_Rehacer cambiar grupo"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1580
+#: ../src/nautilus-file-undo-operations.c:1575
 #, c-format
 msgid "Restore owner of '%s' to '%s'"
 msgstr "Restaurar el propietario de «%s» a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1582
+#: ../src/nautilus-file-undo-operations.c:1577
 #, c-format
 msgid "Set owner of '%s' to '%s'"
 msgstr "Establecer el propietario de «%s» a «%s»"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1585
+#: ../src/nautilus-file-undo-operations.c:1580
 msgid "_Undo Change Owner"
 msgstr "_Deshacer cambiar propietario"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1586
+#: ../src/nautilus-file-undo-operations.c:1581
 msgid "_Redo Change Owner"
 msgstr "_Rehacer cambiar propietario"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:896
+#: ../src/nautilus-file-utilities.c:914
 #, c-format
 msgid "Could not determine original location of “%s” "
 msgstr "No se pudo determinar el lugar original de «%s» "
 
-#: ../libnautilus-private/nautilus-file-utilities.c:900
+#: ../src/nautilus-file-utilities.c:918
 msgid "The item cannot be restored from trash"
 msgstr "No se puede restaurar el elemento desde la papelera"
 
+#: ../src/nautilus-file-utilities.c:1022
+msgid "Audio CD"
+msgstr "CD de música"
+
+#: ../src/nautilus-file-utilities.c:1024
+msgid "Audio DVD"
+msgstr "DVD de música"
+
+#: ../src/nautilus-file-utilities.c:1026
+msgid "Video DVD"
+msgstr "DVD de vídeo"
+
+#: ../src/nautilus-file-utilities.c:1028
+msgid "Video CD"
+msgstr "CD de vídeo"
+
+#: ../src/nautilus-file-utilities.c:1030
+msgid "Super Video CD"
+msgstr "CD de super vídeo"
+
+#: ../src/nautilus-file-utilities.c:1032
+msgid "Photo CD"
+msgstr "CD de Fotos"
+
+#: ../src/nautilus-file-utilities.c:1034
+msgid "Picture CD"
+msgstr "CD de imágenes"
+
+#: ../src/nautilus-file-utilities.c:1036 ../src/nautilus-file-utilities.c:1069
+msgid "Contains digital photos"
+msgstr "Contiene fotos digitales."
+
+#: ../src/nautilus-file-utilities.c:1038
+msgid "Contains music"
+msgstr "Contiene música"
+
+#: ../src/nautilus-file-utilities.c:1040
+msgid "Contains software"
+msgstr "Contiene software"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-directory-view.c:1865
+#. fallback to generic greeting
+#: ../src/nautilus-file-utilities.c:1043
+#, c-format
+msgid "Detected as “%s”"
+msgstr "Detectado como «%s»"
+
+#: ../src/nautilus-file-utilities.c:1065
+msgid "Contains music and photos"
+msgstr "Contiene música y fotos"
+
+#: ../src/nautilus-file-utilities.c:1067
+msgid "Contains photos and music"
+msgstr "Contiene fotos y música"
+
 # src/file-manager/dfos-xfer.c:745
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:80
+#: ../src/nautilus-mime-application-chooser.c:79
 #, c-format
 msgid "Error while adding “%s”: %s"
 msgstr "Error al añadir «%s»: %s"
 
 # src/nautilus-location-bar.c:127
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:82
+#: ../src/nautilus-mime-application-chooser.c:81
 msgid "Could not add application"
 msgstr "No se pudo añadir la aplicación"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:110
+#: ../src/nautilus-mime-application-chooser.c:109
 msgid "Could not forget association"
 msgstr "No se pudo olvidar la asociación"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:134
+#: ../src/nautilus-mime-application-chooser.c:133
 msgid "Forget association"
 msgstr "Olvidar asociación"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:172
+#: ../src/nautilus-mime-application-chooser.c:171
 #, c-format
 msgid "Error while setting “%s” as default application: %s"
 msgstr "Error al establecer «%s» como la aplicación predeterminada: %s"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:174
+#: ../src/nautilus-mime-application-chooser.c:173
 msgid "Could not set as default"
 msgstr "No se pudo establecer como predeterminada"
 
 # src/file-manager/fm-directory-view.c:1865
 #. Translators: the %s here is a file extension
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:252
+#: ../src/nautilus-mime-application-chooser.c:251
 #, c-format
 msgid "%s document"
 msgstr "documento %s"
 
 #. Translators; %s here is a mime-type description
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:259
+#: ../src/nautilus-mime-application-chooser.c:258
 #, c-format
 msgid "Open all files of type “%s” with"
 msgstr "Abrir todos los archivos del tipo «%s» con"
 
 #. Translators: first %s is filename, second %s is mime-type description
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:266
+#: ../src/nautilus-mime-application-chooser.c:265
 #, c-format
 msgid "Select an application to open “%s” and other files of type “%s”"
 msgstr "Seleccione una aplicación para abrir %s y otros archivos del tipo «%s»"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:325
+#: ../src/nautilus-mime-application-chooser.c:324
 msgid "_Add"
 msgstr "_Añadir"
 
 # src/nautilus-sidebar.c:424
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:333
+#: ../src/nautilus-mime-application-chooser.c:332
 msgid "Set as default"
 msgstr "Establecer como predeterminada"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:312
+#: ../src/nautilus-program-choosing.c:310
 msgid "Sorry, but you cannot execute commands from a remote site."
 msgstr "No puede ejecutar comandos desde un sitio remoto."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:314
+#: ../src/nautilus-program-choosing.c:312
 msgid "This is disabled due to security considerations."
 msgstr "Esto está desactivado debido a consideraciones de seguridad."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:325
-#: ../libnautilus-private/nautilus-program-choosing.c:393
+#: ../src/nautilus-program-choosing.c:323
+#: ../src/nautilus-program-choosing.c:391
 msgid "There was an error launching the application."
 msgstr "Se ha producido un error al lanzar la aplicación."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:350
-#: ../libnautilus-private/nautilus-program-choosing.c:361
+#: ../src/nautilus-program-choosing.c:348
+#: ../src/nautilus-program-choosing.c:359
 msgid "This drop target only supports local files."
 msgstr "Este destino donde soltar sólo soporta archivos locales."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:351
+#: ../src/nautilus-program-choosing.c:349
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Para abrir archivos no locales cópielos a una carpeta local y luego "
 "suéltelos nuevamente."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:362
+#: ../src/nautilus-program-choosing.c:360
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
@@ -2893,26 +2946,24 @@ msgstr ""
 "suéltelos nuevamente. Los archivos locales que ha soltado ya han sido "
 "abiertos."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:391
+#: ../src/nautilus-program-choosing.c:389
 msgid "Details: "
 msgstr "Detalles: "
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: ../libnautilus-private/nautilus-progress-info.c:297
+#: ../src/nautilus-progress-info.c:296
 msgid "Cancelled"
 msgstr "Cancelado"
 
 # src/file-manager/dfos-xfer.c:703
-#: ../libnautilus-private/nautilus-progress-info.c:360
-#: ../libnautilus-private/nautilus-progress-info.c:378
+#: ../src/nautilus-progress-info.c:359 ../src/nautilus-progress-info.c:377
 msgid "Preparing"
 msgstr "Preparando"
 
-#: ../libnautilus-private/nautilus-query.c:463
-#: ../libnautilus-private/nautilus-search-directory-file.c:159
-#: ../libnautilus-private/nautilus-search-directory-file.c:211
-#: ../libnautilus-private/nautilus-search-directory-file.c:256
+#: ../src/nautilus-query.c:469 ../src/nautilus-search-directory-file.c:158
+#: ../src/nautilus-search-directory-file.c:210
+#: ../src/nautilus-search-directory-file.c:255
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:51
 #: ../src/resources/ui/nautilus-search-popover.ui.h:12
 #: ../src/resources/ui/nautilus-toolbar.ui.h:5
@@ -2920,15 +2971,72 @@ msgid "Search"
 msgstr "Buscar"
 
 # libnautilus-private/nautilus-global-preferences.c:727
-#: ../libnautilus-private/nautilus-query.c:466
+#: ../src/nautilus-query.c:472
 #, c-format
 msgid "Search for “%s”"
 msgstr "Buscar «%s»"
 
-#: ../libnautilus-private/nautilus-search-engine.c:201
+#: ../src/nautilus-search-engine.c:200
 msgid "Unable to complete the requested search"
 msgstr "No se pudo completa la búsqueda solicitada"
 
+#. days
+#: ../src/nautilus-ui-utilities.c:364
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Hace %d día"
+msgstr[1] "Hace %d días"
+
+# src/file-manager/fm-properties-window.c:1569
+#. weeks
+#: ../src/nautilus-ui-utilities.c:369
+#, c-format
+#| msgid "Last _Opened"
+msgid "Last week"
+msgid_plural "%d weeks ago"
+msgstr[0] "Última semana"
+msgstr[1] "Hace %d semanas"
+
+#. months
+#: ../src/nautilus-ui-utilities.c:374
+#, c-format
+msgid "Last month"
+msgid_plural "%d months ago"
+msgstr[0] "Último mes"
+msgstr[1] "Hace %d meses"
+
+# src/file-manager/fm-directory-view.c:2154
+#. years
+#: ../src/nautilus-ui-utilities.c:379
+#, c-format
+#| msgid "Last _used"
+msgid "Last year"
+msgid_plural "%d years ago"
+msgstr[0] "Último año"
+msgstr[1] "Hace %d años"
+
+#: ../nautilus-desktop/nautilus-desktop-application.c:256
+msgid "Always manage the desktop (ignore the GSettings preference)."
+msgstr ""
+"Gestionar siempre el escritorio (ignorar las preferencias de GSettings)."
+
+#: ../nautilus-desktop/nautilus-desktop-directory-file.c:434
+#: ../nautilus-desktop/nautilus-desktop-icon-file.c:151
+msgid "on the desktop"
+msgstr "en el escritorio"
+
+#: ../nautilus-desktop/nautilus-desktop-icon-file.c:409
+#, c-format
+msgid "Unable to rename desktop icon"
+msgstr "No se pudo renombrar el icono del escritorio"
+
+#. hardcode "Desktop"
+#: ../nautilus-desktop/nautilus-desktop-window.c:201
+#: ../nautilus-desktop/nautilus-desktop-window.c:373
+msgid "Desktop"
+msgstr "Escritorio"
+
 #: ../nautilus-sendto-extension/nautilus-nste.c:96
 #: ../nautilus-sendto-extension/nautilus-nste.c:101
 msgid "Send to…"
@@ -2943,7 +3051,7 @@ msgid "Send files by mail…"
 msgstr "Enviar archivos por correo-e…"
 
 #. Some sort of failure occurred. How 'bout we tell the user?
-#: ../src/nautilus-application.c:158 ../src/nautilus-window-slot.c:1113
+#: ../src/nautilus-application.c:158 ../src/nautilus-window-slot.c:1188
 msgid "Oops! Something went wrong."
 msgstr "Algo salió mal."
 
@@ -2970,25 +3078,21 @@ msgstr ""
 "%s"
 
 # src/nautilus-main.c:117
-#: ../src/nautilus-application.c:546
+#: ../src/nautilus-application.c:554
 msgid "--check cannot be used with other options."
 msgstr "--check no se puede usar con otras opciones."
 
 # src/nautilus-main.c:117
-#: ../src/nautilus-application.c:553
+#: ../src/nautilus-application.c:561
 msgid "--quit cannot be used with URIs."
 msgstr "--quit no se puede usar con URI."
 
 # src/nautilus-main.c:117
-#: ../src/nautilus-application.c:561
+#: ../src/nautilus-application.c:569
 msgid "--select must be used with at least an URI."
 msgstr "--select se debe usar con al menos un URI."
 
-#: ../src/nautilus-application.c:568
-msgid "--no-desktop and --force-desktop cannot be used together."
-msgstr "--no-desktop y --force-desktop no se pueden usar juntas."
-
-#: ../src/nautilus-application.c:681
+#: ../src/nautilus-application.c:682
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -2998,56 +3102,46 @@ msgstr ""
 "%s"
 
 # src/nautilus-main.c:63
-#: ../src/nautilus-application.c:820
+#: ../src/nautilus-application.c:797
 msgid "Perform a quick set of self-check tests."
 msgstr "Realiza un conjunto rápido de auto-verificaciones."
 
-#: ../src/nautilus-application.c:827
+#: ../src/nautilus-application.c:804
 msgid "Create the initial window with the given geometry."
 msgstr "Crea la ventana inicial con la geometría indicada."
 
-#: ../src/nautilus-application.c:827
+#: ../src/nautilus-application.c:804
 msgid "GEOMETRY"
 msgstr "GEOMETRÍA"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-application.c:829
+#: ../src/nautilus-application.c:806
 msgid "Show the version of the program."
 msgstr "Mostrar la versión del programa."
 
-#: ../src/nautilus-application.c:831
+#: ../src/nautilus-application.c:808
 msgid "Always open a new window for browsing specified URIs"
 msgstr "Abrir siempre una ventana nueva para explorar las URI especificadas"
 
-#: ../src/nautilus-application.c:833
+#: ../src/nautilus-application.c:810
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Sólo crear ventanas para las URI explícitamente especificadas."
 
-#: ../src/nautilus-application.c:835
-msgid "Never manage the desktop (ignore the GSettings preference)."
-msgstr ""
-"No gestionar nunca el escritorio (ignorar las preferencias de GSettings)."
-
-#: ../src/nautilus-application.c:837
-msgid "Always manage the desktop (ignore the GSettings preference)."
-msgstr ""
-"Gestionar siempre el escritorio (ignorar las preferencias de GSettings)."
-
 # src/nautilus-main.c:65
-#: ../src/nautilus-application.c:839
+#: ../src/nautilus-application.c:812
 msgid "Quit Nautilus."
 msgstr "Salir de Nautilus."
 
-#: ../src/nautilus-application.c:841
+#: ../src/nautilus-application.c:814
 msgid "Select specified URI in parent folder."
 msgstr "Seleccionar el URI especificado en la carpeta padre."
 
-#: ../src/nautilus-application.c:842
+#: ../src/nautilus-application.c:815
 msgid "[URI...]"
 msgstr "[URI…]"
 
-#: ../src/nautilus-autorun-software.c:142
-#: ../src/nautilus-autorun-software.c:145
+#: ../src/nautilus-autorun-software.c:141
+#: ../src/nautilus-autorun-software.c:144
 #, c-format
 msgid ""
 "Unable to start the program:\n"
@@ -3056,16 +3150,16 @@ msgstr ""
 "No se pudo iniciar el programa:\n"
 "%s"
 
-#: ../src/nautilus-autorun-software.c:148
+#: ../src/nautilus-autorun-software.c:147
 #, c-format
 msgid "Unable to locate the program"
 msgstr "No se pudo encontrar el programa"
 
-#: ../src/nautilus-autorun-software.c:170
+#: ../src/nautilus-autorun-software.c:169
 msgid "Oops! There was a problem running this software."
 msgstr "Hubo un problema al ejecutar este programa."
 
-#: ../src/nautilus-autorun-software.c:201
+#: ../src/nautilus-autorun-software.c:199
 #, c-format
 msgid ""
 "“%s” contains software intended to be automatically started. Would you like "
@@ -3074,17 +3168,17 @@ msgstr ""
 "«%s» contiene software previsto para iniciarse automáticamente. ¿Quiere "
 "ejecutarlo?"
 
-#: ../src/nautilus-autorun-software.c:205
+#: ../src/nautilus-autorun-software.c:203
 msgid "If you don't trust this location or aren't sure, press Cancel."
 msgstr "Si no confía en este lugar, o no está seguro, pulse «Cancelar»."
 
-#: ../src/nautilus-autorun-software.c:240 ../src/nautilus-mime-actions.c:636
+#: ../src/nautilus-autorun-software.c:234 ../src/nautilus-mime-actions.c:634
 msgid "_Run"
 msgstr "E_jecutar"
 
 # src/file-manager/fm-directory-view.c:2403
 # src/file-manager/fm-directory-view.c:2646
-#: ../src/nautilus-canvas-view-container.c:443
+#: ../src/nautilus-canvas-view-container.c:349
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:7
 msgid "Icon View"
 msgstr "Vista de icono"
@@ -3092,7 +3186,7 @@ msgstr "Vista de icono"
 # components/music/nautilus-music-view.c:198
 #: ../src/nautilus-desktop-item-properties.c:404
 #: ../src/nautilus-desktop-item-properties.c:414
-#: ../src/nautilus-image-properties-page.c:370
+#: ../src/nautilus-image-properties-page.c:369
 msgid "Comment"
 msgstr "Comentario"
 
@@ -3102,8 +3196,8 @@ msgstr "URL"
 
 #: ../src/nautilus-desktop-item-properties.c:410
 #: ../src/nautilus-desktop-item-properties.c:420
-#: ../src/nautilus-image-properties-page.c:361
-#: ../src/nautilus-image-properties-page.c:416
+#: ../src/nautilus-image-properties-page.c:360
+#: ../src/nautilus-image-properties-page.c:415
 msgid "Description"
 msgstr "Descripción"
 
@@ -3111,95 +3205,90 @@ msgstr "Descripción"
 msgid "Command"
 msgstr "Comando"
 
-#. hardcode "Desktop"
-#: ../src/nautilus-desktop-window.c:195 ../src/nautilus-desktop-window.c:364
-msgid "Desktop"
-msgstr "Escritorio"
-
 # src/nautilus-window-manage-views.c:648
-#: ../src/nautilus-error-reporting.c:67
+#: ../src/nautilus-error-reporting.c:66
 #, c-format
 msgid "You do not have the permissions necessary to view the contents of “%s”."
 msgstr "No tiene los permisos suficientes para ver el contenido de «%s»."
 
-#: ../src/nautilus-error-reporting.c:71
+#: ../src/nautilus-error-reporting.c:70
 #, c-format
 msgid "“%s” could not be found. Perhaps it has recently been deleted."
 msgstr "No se pudo encontrar «%s». Quizás se haya eliminado recientemente."
 
 # src/file-manager/fm-error-reporting.c:115
-#: ../src/nautilus-error-reporting.c:75
+#: ../src/nautilus-error-reporting.c:74
 #, c-format
 msgid "Sorry, could not display all the contents of “%s”: %s"
 msgstr "No se pudo mostrar todo el contenido de «%s»: %s"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-error-reporting.c:82
+#: ../src/nautilus-error-reporting.c:81
 msgid "This location could not be displayed."
 msgstr "No se pudo mostrar este lugar."
 
 # src/file-manager/fm-error-reporting.c:85
-#: ../src/nautilus-error-reporting.c:106
+#: ../src/nautilus-error-reporting.c:105
 #, c-format
 msgid "You do not have the permissions necessary to change the group of “%s”."
 msgstr "No tiene los permisos suficientes para cambiar el grupo de «%s»."
 
 # src/file-manager/fm-error-reporting.c:93
 #. fall through
-#: ../src/nautilus-error-reporting.c:119
+#: ../src/nautilus-error-reporting.c:118
 #, c-format
 msgid "Sorry, could not change the group of “%s”: %s"
 msgstr "No se pudo cambiar el grupo de «%s»: %s"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-error-reporting.c:124
+#: ../src/nautilus-error-reporting.c:123
 msgid "The group could not be changed."
 msgstr "El grupo no pudo cambiarse."
 
 # src/file-manager/fm-error-reporting.c:115
-#: ../src/nautilus-error-reporting.c:144
+#: ../src/nautilus-error-reporting.c:143
 #, c-format
 msgid "Sorry, could not change the owner of “%s”: %s"
 msgstr "No se pudo cambiar el propietario de «%s»: %s"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-error-reporting.c:146
+#: ../src/nautilus-error-reporting.c:145
 msgid "The owner could not be changed."
 msgstr "No se pudo cambiar el propietario."
 
 # src/file-manager/fm-error-reporting.c:137
-#: ../src/nautilus-error-reporting.c:166
+#: ../src/nautilus-error-reporting.c:165
 #, c-format
 msgid "Sorry, could not change the permissions of “%s”: %s"
 msgstr "No se pudieron cambiar los permisos de «%s»: %s"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-error-reporting.c:168
+#: ../src/nautilus-error-reporting.c:167
 msgid "The permissions could not be changed."
 msgstr "Los permisos no pudieron cambiarse."
 
 # src/file-manager/fm-error-reporting.c:50
-#: ../src/nautilus-error-reporting.c:203
+#: ../src/nautilus-error-reporting.c:202
 #, c-format
 msgid ""
 "The name “%s” is already used in this location. Please use a different name."
 msgstr ""
 "El nombre «%s» ya se está usando en este lugar. Use un nombre distinto."
 
-#: ../src/nautilus-error-reporting.c:208
+#: ../src/nautilus-error-reporting.c:207
 #, c-format
 msgid ""
 "There is no “%s” in this location. Perhaps it was just moved or deleted?"
 msgstr "No existe «%s» en este lugar. ¿Quizás acaba de moverse o eliminarse?"
 
 # src/file-manager/fm-error-reporting.c:55
-#: ../src/nautilus-error-reporting.c:213
+#: ../src/nautilus-error-reporting.c:212
 #, c-format
 msgid "You do not have the permissions necessary to rename “%s”."
 msgstr "No tiene los permisos suficientes para cambiar el nombre de «%s»."
 
 # src/file-manager/fm-error-reporting.c:50
-#: ../src/nautilus-error-reporting.c:218
+#: ../src/nautilus-error-reporting.c:217
 #, c-format
 msgid ""
 "The name “%s” is not valid because it contains the character “/”. Please use "
@@ -3209,146 +3298,146 @@ msgstr ""
 "distinto."
 
 # src/file-manager/fm-error-reporting.c:50
-#: ../src/nautilus-error-reporting.c:222
+#: ../src/nautilus-error-reporting.c:221
 #, c-format
 msgid "The name “%s” is not valid. Please use a different name."
 msgstr "El nombre «%s» no es válido. Use un nombre distinto."
 
 # src/file-manager/fm-error-reporting.c:50
-#: ../src/nautilus-error-reporting.c:228
+#: ../src/nautilus-error-reporting.c:227
 #, c-format
 msgid "The name “%s” is too long. Please use a different name."
 msgstr "El nombre «%s» es demasiado largo. Use un nombre distinto."
 
 # src/file-manager/fm-error-reporting.c:64
 #. fall through
-#: ../src/nautilus-error-reporting.c:242
+#: ../src/nautilus-error-reporting.c:241
 #, c-format
 msgid "Sorry, could not rename “%s” to “%s”: %s"
 msgstr "No se ha podido renombrar «%s» a «%s»: %s"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-error-reporting.c:250
+#: ../src/nautilus-error-reporting.c:249
 msgid "The item could not be renamed."
 msgstr "El elemento no se pudo renombrar."
 
 # src/file-manager/fm-error-reporting.c:214
-#: ../src/nautilus-error-reporting.c:347
+#: ../src/nautilus-error-reporting.c:346
 #, c-format
 msgid "Renaming “%s” to “%s”."
 msgstr "Renombrando  «%s» a «%s»."
 
-#: ../src/nautilus-files-view.c:403
+#: ../src/nautilus-files-view.c:375
 msgid "Searching…"
 msgstr "Buscando…"
 
-#: ../src/nautilus-files-view.c:403
-#: ../src/nautilus-image-properties-page.c:708
-#: ../src/nautilus-list-model.c:371 ../src/nautilus-window-slot.c:628
+#: ../src/nautilus-files-view.c:375
+#: ../src/nautilus-image-properties-page.c:707
+#: ../src/nautilus-list-model.c:374 ../src/nautilus-window-slot.c:696
 msgid "Loading…"
 msgstr "Cargando…"
 
 # src/file-manager/fm-directory-view.c:1855
-#: ../src/nautilus-files-view.c:1093 ../src/nautilus-mime-actions.c:969
-#: ../src/nautilus-mime-actions.c:1713
+#: ../src/nautilus-files-view.c:1004 ../src/nautilus-mime-actions.c:960
+#: ../src/nautilus-mime-actions.c:1702
 msgid "Are you sure you want to open all files?"
 msgstr "¿Está seguro de que quiere abrir todos los archivos?"
 
-#: ../src/nautilus-files-view.c:1095
+#: ../src/nautilus-files-view.c:1006
 #, c-format
 msgid "This will open %'d separate tab."
 msgid_plural "This will open %'d separate tabs."
 msgstr[0] "Esto abrirá %'d pestaña separada."
 msgstr[1] "Esto abrirá %'d pestañas separadas."
 
-#: ../src/nautilus-files-view.c:1098
+#: ../src/nautilus-files-view.c:1009
 #, c-format
 msgid "This will open %'d separate window."
 msgid_plural "This will open %'d separate windows."
 msgstr[0] "Esto abrirá %'d ventana separada."
 msgstr[1] "Esto abrirá %'d ventanas separadas."
 
-#: ../src/nautilus-files-view.c:1102 ../src/nautilus-location-entry.c:270
-#: ../src/nautilus-mime-actions.c:978 ../src/nautilus-mime-actions.c:1155
-#: ../src/nautilus-mime-actions.c:1717
+#: ../src/nautilus-files-view.c:1013 ../src/nautilus-location-entry.c:269
+#: ../src/nautilus-mime-actions.c:969 ../src/nautilus-mime-actions.c:1143
+#: ../src/nautilus-mime-actions.c:1706
 msgid "_OK"
 msgstr "_Aceptar"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: ../src/nautilus-files-view.c:1573
+#: ../src/nautilus-files-view.c:1485
 msgid "Select Items Matching"
 msgstr "Seleccionar elementos que coincidan con"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: ../src/nautilus-files-view.c:1578 ../src/nautilus-files-view.c:5282
+#: ../src/nautilus-files-view.c:1490 ../src/nautilus-files-view.c:5219
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../src/nautilus-files-view.c:1586
+#: ../src/nautilus-files-view.c:1498
 msgid "_Pattern:"
 msgstr "_Patrón:"
 
 # src/file-manager/fm-properties-window.c:1237
-#: ../src/nautilus-files-view.c:1592
+#: ../src/nautilus-files-view.c:1504
 msgid "Examples: "
 msgstr "Ejemplos: "
 
-#: ../src/nautilus-files-view.c:1831
+#: ../src/nautilus-files-view.c:1745
 msgid "A folder with that name already exists."
 msgstr "Ya existe una carpeta con el mismo nombre."
 
-#: ../src/nautilus-files-view.c:1833
+#: ../src/nautilus-files-view.c:1747
 msgid "A file with that name already exists."
 msgstr "Ya existe un archivo con el mismo nombre."
 
-#: ../src/nautilus-files-view.c:1848
+#: ../src/nautilus-files-view.c:1762
 msgid "Folder names cannot contain “/”."
 msgstr "Los nombres de carpetas no pueden contener «/»."
 
-#: ../src/nautilus-files-view.c:1850
+#: ../src/nautilus-files-view.c:1764
 msgid "Files names cannot contain “/”."
 msgstr "Los nombres de archivos no pueden contener «/»."
 
-#: ../src/nautilus-files-view.c:1853
+#: ../src/nautilus-files-view.c:1767
 msgid "A folder can not be called “.”."
 msgstr "Una carpeta no se puede llamar «.»."
 
-#: ../src/nautilus-files-view.c:1855
+#: ../src/nautilus-files-view.c:1769
 msgid "A file can not be called “.”."
 msgstr "Un archivo no se puede llamar «.»."
 
-#: ../src/nautilus-files-view.c:1858
+#: ../src/nautilus-files-view.c:1772
 msgid "A folder can not be called “..”."
 msgstr "Una carpeta no se puede llamar «..»."
 
-#: ../src/nautilus-files-view.c:1860
+#: ../src/nautilus-files-view.c:1774
 msgid "A file can not be called “..”."
 msgstr "Un archivo no se puede llamar «..»."
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../src/nautilus-files-view.c:2091 ../src/nautilus-files-view.c:2159
+#: ../src/nautilus-files-view.c:2005 ../src/nautilus-files-view.c:2073
 msgid "Folder name"
 msgstr "Nombre de la carpeta"
 
-#: ../src/nautilus-files-view.c:2093
+#: ../src/nautilus-files-view.c:2007
 msgid "File name"
 msgstr "Nombre de archivo"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../src/nautilus-files-view.c:2158
+#: ../src/nautilus-files-view.c:2072
 msgid "Create"
 msgstr "Crear"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../src/nautilus-files-view.c:2160
+#: ../src/nautilus-files-view.c:2074
 msgid "New Folder"
 msgstr "Carpeta nueva"
 
-#: ../src/nautilus-files-view.c:2601
+#: ../src/nautilus-files-view.c:2515
 msgid ""
 "Nautilus 3.6 deprecated this directory and tried migrating this "
 "configuration to ~/.local/share/nautilus"
@@ -3357,13 +3446,13 @@ msgstr ""
 "~/.local/share/nautilus"
 
 # src/file-manager/fm-directory-view.c:1015
-#: ../src/nautilus-files-view.c:3028 ../src/nautilus-files-view.c:3063
+#: ../src/nautilus-files-view.c:2942 ../src/nautilus-files-view.c:2977
 #, c-format
 msgid "“%s” selected"
 msgstr "«%s» seleccionado"
 
 # src/file-manager/fm-directory-view.c:1020
-#: ../src/nautilus-files-view.c:3030
+#: ../src/nautilus-files-view.c:2944
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
@@ -3371,7 +3460,7 @@ msgstr[0] "%'d carpeta seleccionada"
 msgstr[1] "%'d carpetas seleccionadas"
 
 # src/file-manager/fm-directory-view.c:1030
-#: ../src/nautilus-files-view.c:3040
+#: ../src/nautilus-files-view.c:2954
 #, c-format
 msgid "(containing %'d item)"
 msgid_plural "(containing %'d items)"
@@ -3380,7 +3469,7 @@ msgstr[1] "(contiene %'d elementos)"
 
 # src/file-manager/fm-directory-view.c:1030
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: ../src/nautilus-files-view.c:3051
+#: ../src/nautilus-files-view.c:2965
 #, c-format
 msgid "(containing a total of %'d item)"
 msgid_plural "(containing a total of %'d items)"
@@ -3388,7 +3477,7 @@ msgstr[0] "(contiene un total de %'d elemento)"
 msgstr[1] "(contiene un total de %'d elementos)"
 
 # src/file-manager/fm-directory-view.c:1045
-#: ../src/nautilus-files-view.c:3066
+#: ../src/nautilus-files-view.c:2980
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -3397,7 +3486,7 @@ msgstr[1] "%'d elementos seleccionados"
 
 # src/file-manager/fm-directory-view.c:1055
 #. Folders selected also, use "other" terminology
-#: ../src/nautilus-files-view.c:3073
+#: ../src/nautilus-files-view.c:2987
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -3408,7 +3497,7 @@ msgstr[1] "otros %'d elementos seleccionados"
 #. * needs to use something other than parentheses. The
 #. * the message in parentheses is the size of the selected items.
 #.
-#: ../src/nautilus-files-view.c:3087
+#: ../src/nautilus-files-view.c:3001
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
@@ -3421,44 +3510,44 @@ msgstr "(%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/nautilus-files-view.c:3111
+#: ../src/nautilus-files-view.c:3025
 #, c-format
 msgid "%s %s, %s %s"
 msgstr "%s %s, %s %s"
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: ../src/nautilus-files-view.c:5271
+#: ../src/nautilus-files-view.c:5208
 msgid "Select Move Destination"
 msgstr "Seleccionar el destino para mover"
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: ../src/nautilus-files-view.c:5273
+#: ../src/nautilus-files-view.c:5210
 msgid "Select Copy Destination"
 msgstr "Seleccionar el destino para copiar"
 
 #. Translators: %s is a file name formatted for display
-#: ../src/nautilus-files-view.c:5729
+#: ../src/nautilus-files-view.c:5671
 #, c-format
 msgid "Unable to remove “%s”"
 msgstr "No se pudo quitar «%s»"
 
 #. Translators: %s is a file name formatted for display
-#: ../src/nautilus-files-view.c:5756
+#: ../src/nautilus-files-view.c:5698
 #, c-format
 msgid "Unable to eject “%s”"
 msgstr "No se pudo expulsar «%s»"
 
-#: ../src/nautilus-files-view.c:5778
+#: ../src/nautilus-files-view.c:5720
 msgid "Unable to stop drive"
 msgstr "No se pudo parar la unidad"
 
 #. Translators: %s is a file name formatted for display
-#: ../src/nautilus-files-view.c:5883
+#: ../src/nautilus-files-view.c:5825
 #, c-format
 msgid "Unable to start “%s”"
 msgstr "No se pudo iniciar «%s»"
 
-#: ../src/nautilus-files-view.c:6640
+#: ../src/nautilus-files-view.c:6566
 #, c-format
 msgid "New Folder with Selection (%'d Item)"
 msgid_plural "New Folder with Selection (%'d Items)"
@@ -3466,150 +3555,150 @@ msgstr[0] "Carpeta nueva con la selección (%'d elemento)"
 msgstr[1] "Carpeta nueva con la selección (%'d elementos)"
 
 # src/nautilus-sidebar.c:1145
-#: ../src/nautilus-files-view.c:6688
+#: ../src/nautilus-files-view.c:6614
 #, c-format
 msgid "Open With %s"
 msgstr "Abrir con %s"
 
-#: ../src/nautilus-files-view.c:6697
+#: ../src/nautilus-files-view.c:6623
 msgid "Run"
 msgstr "Ejecutar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: ../src/nautilus-files-view.c:6699
+#: ../src/nautilus-files-view.c:6625
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/nautilus-files-view.c:6750
+#: ../src/nautilus-files-view.c:6676
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:19
 msgid "_Start"
 msgstr "_Iniciar"
 
-#: ../src/nautilus-files-view.c:6753 ../src/gtk/gtkplacesview.c:1657
+#: ../src/nautilus-files-view.c:6679 ../src/gtk/nautilusgtkplacesview.c:1632
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ../src/nautilus-files-view.c:6756
+#: ../src/nautilus-files-view.c:6682
 msgid "_Start Multi-disk Drive"
 msgstr "_Iniciar unidad multidisco"
 
-#: ../src/nautilus-files-view.c:6759
+#: ../src/nautilus-files-view.c:6685
 msgid "U_nlock Drive"
 msgstr "D_esbloquear unidad"
 
-#: ../src/nautilus-files-view.c:6775
+#: ../src/nautilus-files-view.c:6701
 msgid "Stop Drive"
 msgstr "Detener unidad"
 
 # src/nautilus-property-browser.c:1985
-#: ../src/nautilus-files-view.c:6778
+#: ../src/nautilus-files-view.c:6704
 msgid "_Safely Remove Drive"
 msgstr "Expulsar unidad de forma _segura"
 
-#: ../src/nautilus-files-view.c:6781 ../src/gtk/gtkplacesview.c:1647
+#: ../src/nautilus-files-view.c:6707 ../src/gtk/nautilusgtkplacesview.c:1622
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: ../src/nautilus-files-view.c:6784
+#: ../src/nautilus-files-view.c:6710
 msgid "_Stop Multi-disk Drive"
 msgstr "_Parar unidad multidisco"
 
-#: ../src/nautilus-files-view.c:6787
+#: ../src/nautilus-files-view.c:6713
 msgid "_Lock Drive"
 msgstr "_Bloquear unidad"
 
 # src/file-manager/fm-properties-window.c:878
-#: ../src/nautilus-files-view.c:8238
+#: ../src/nautilus-files-view.c:8188
 msgid "Content View"
 msgstr "Vista del contenido"
 
-#: ../src/nautilus-files-view.c:8239
+#: ../src/nautilus-files-view.c:8189
 msgid "View of the current folder"
 msgstr "Vista de la carpeta actual"
 
-#: ../src/nautilus-files-view-dnd.c:172 ../src/nautilus-files-view-dnd.c:206
-#: ../src/nautilus-files-view-dnd.c:297
+#: ../src/nautilus-files-view-dnd.c:171 ../src/nautilus-files-view-dnd.c:205
+#: ../src/nautilus-files-view-dnd.c:296
 msgid "Drag and drop is not supported."
 msgstr "Arrastrar y soltar no está soportado."
 
-#: ../src/nautilus-files-view-dnd.c:173
+#: ../src/nautilus-files-view-dnd.c:172
 msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Arrastrar y soltar sólo está soportado en los sistemas de archivos locales."
 
-#: ../src/nautilus-files-view-dnd.c:207 ../src/nautilus-files-view-dnd.c:298
+#: ../src/nautilus-files-view-dnd.c:206 ../src/nautilus-files-view-dnd.c:297
 msgid "An invalid drag type was used."
 msgstr "Se ha utilizado un tipo de arrastre no válido."
 
 #. Translator: This is the filename used for when you dnd text to a directory
-#: ../src/nautilus-files-view-dnd.c:385
+#: ../src/nautilus-files-view-dnd.c:384
 msgid "Dropped Text.txt"
 msgstr "Se soltó Texto.txt"
 
 #. Translator: This is the filename used for when you dnd raw
 #. * data to a directory, if the source didn't supply a name.
 #.
-#: ../src/nautilus-files-view-dnd.c:483
+#: ../src/nautilus-files-view-dnd.c:482
 msgid "dropped data"
 msgstr "se soltaron los datos"
 
-#: ../src/nautilus-image-properties-page.c:331
+#: ../src/nautilus-image-properties-page.c:330
 msgid "Image Type"
 msgstr "Tipo de imagen"
 
-#: ../src/nautilus-image-properties-page.c:333
-#: ../src/nautilus-image-properties-page.c:339
+#: ../src/nautilus-image-properties-page.c:332
+#: ../src/nautilus-image-properties-page.c:338
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d píxel"
 msgstr[1] "%d píxeles"
 
-#: ../src/nautilus-image-properties-page.c:337
+#: ../src/nautilus-image-properties-page.c:336
 msgid "Width"
 msgstr "Anchura"
 
-#: ../src/nautilus-image-properties-page.c:343
+#: ../src/nautilus-image-properties-page.c:342
 msgid "Height"
 msgstr "Altura"
 
+#: ../src/nautilus-image-properties-page.c:355
 #: ../src/nautilus-image-properties-page.c:356
-#: ../src/nautilus-image-properties-page.c:357
 msgid "Title"
 msgstr "Título"
 
+#: ../src/nautilus-image-properties-page.c:357
 #: ../src/nautilus-image-properties-page.c:358
-#: ../src/nautilus-image-properties-page.c:359
 msgid "Author"
 msgstr "Autor"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:725
-#: ../src/nautilus-image-properties-page.c:362
-#: ../src/nautilus-image-properties-page.c:419
+#: ../src/nautilus-image-properties-page.c:361
+#: ../src/nautilus-image-properties-page.c:418
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/nautilus-image-properties-page.c:363
+#: ../src/nautilus-image-properties-page.c:362
 msgid "Created On"
 msgstr "Creado el"
 
-#: ../src/nautilus-image-properties-page.c:364
+#: ../src/nautilus-image-properties-page.c:363
 msgid "Created By"
 msgstr "Creado por"
 
 #. Translators: this refers to a legal disclaimer string embedded in
 #. * the metadata of an image
-#: ../src/nautilus-image-properties-page.c:367
+#: ../src/nautilus-image-properties-page.c:366
 msgid "Disclaimer"
 msgstr "Aviso legal"
 
-#: ../src/nautilus-image-properties-page.c:368
+#: ../src/nautilus-image-properties-page.c:367
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/nautilus-image-properties-page.c:369
+#: ../src/nautilus-image-properties-page.c:368
 msgid "Source"
 msgstr "Fuente"
 
@@ -3619,7 +3708,7 @@ msgstr "Fuente"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: ../src/nautilus-image-properties-page.c:384
+#: ../src/nautilus-image-properties-page.c:383
 msgid "Camera Brand"
 msgstr "Marca de la cámara"
 
@@ -3629,115 +3718,115 @@ msgstr "Marca de la cámara"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: ../src/nautilus-image-properties-page.c:385
+#: ../src/nautilus-image-properties-page.c:384
 msgid "Camera Model"
 msgstr "Modelo de la cámara"
 
 #. Choose which date to show in order of relevance
-#: ../src/nautilus-image-properties-page.c:388
+#: ../src/nautilus-image-properties-page.c:387
 msgid "Date Taken"
 msgstr "Fecha en que se tomó"
 
 # src/file-manager/fm-list-view.c:1599
 # src/file-manager/fm-search-list-view.c:158
-#: ../src/nautilus-image-properties-page.c:389
+#: ../src/nautilus-image-properties-page.c:388
 msgid "Date Digitized"
 msgstr "Fecha de digitalización"
 
 # src/file-manager/fm-list-view.c:1599
 # src/file-manager/fm-search-list-view.c:158
-#: ../src/nautilus-image-properties-page.c:390
+#: ../src/nautilus-image-properties-page.c:389
 msgid "Date Modified"
 msgstr "Fecha de modificación"
 
-#: ../src/nautilus-image-properties-page.c:394
+#: ../src/nautilus-image-properties-page.c:393
 msgid "Exposure Time"
 msgstr "Tiempo de exposición"
 
-#: ../src/nautilus-image-properties-page.c:395
+#: ../src/nautilus-image-properties-page.c:394
 msgid "Aperture Value"
 msgstr "Valor de apertura"
 
-#: ../src/nautilus-image-properties-page.c:396
+#: ../src/nautilus-image-properties-page.c:395
 msgid "ISO Speed Rating"
 msgstr "Tasa de velocidad ISO"
 
-#: ../src/nautilus-image-properties-page.c:397
+#: ../src/nautilus-image-properties-page.c:396
 msgid "Flash Fired"
 msgstr "Con flash"
 
-#: ../src/nautilus-image-properties-page.c:398
+#: ../src/nautilus-image-properties-page.c:397
 msgid "Metering Mode"
 msgstr "Modo de medida"
 
 # libnautilus-private/nautilus-file.c:2965
-#: ../src/nautilus-image-properties-page.c:399
+#: ../src/nautilus-image-properties-page.c:398
 msgid "Exposure Program"
 msgstr "Programa de exposición"
 
-#: ../src/nautilus-image-properties-page.c:400
+#: ../src/nautilus-image-properties-page.c:399
 msgid "Focal Length"
 msgstr "Longitud focal"
 
-#: ../src/nautilus-image-properties-page.c:401
+#: ../src/nautilus-image-properties-page.c:400
 msgid "Software"
 msgstr "Software"
 
 # src/nautilus-property-browser.c:858
-#: ../src/nautilus-image-properties-page.c:417
+#: ../src/nautilus-image-properties-page.c:416
 msgid "Keywords"
 msgstr "Palabras clave"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../src/nautilus-image-properties-page.c:418
+#: ../src/nautilus-image-properties-page.c:417
 msgid "Creator"
 msgstr "Creador"
 
 # src/file-manager/fm-properties-window.c:844
-#: ../src/nautilus-image-properties-page.c:420
+#: ../src/nautilus-image-properties-page.c:419
 msgid "Rating"
 msgstr "Puntuación"
 
-#: ../src/nautilus-image-properties-page.c:443
+#: ../src/nautilus-image-properties-page.c:442
 msgid "Failed to load image information"
 msgstr "Falló al cargar la información de la imagen"
 
-#: ../src/nautilus-list-model.c:369
+#: ../src/nautilus-list-model.c:372
 msgid "(Empty)"
 msgstr "(Vacío)"
 
 # src/nautilus-sidebar.c:424
-#: ../src/nautilus-list-view.c:1267
+#: ../src/nautilus-list-view.c:1266
 msgid "Use Default"
 msgstr "Usar predeterminado"
 
 # src/file-manager/fm-directory-view.c:2403
 # src/file-manager/fm-directory-view.c:2646
-#: ../src/nautilus-list-view.c:1818
+#: ../src/nautilus-list-view.c:1819
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:8
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../src/nautilus-list-view.c:2638
+#: ../src/nautilus-list-view.c:2639
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s columnas visibles"
 
 # src/file-manager/fm-icon-text-window.c:267
-#: ../src/nautilus-list-view.c:2658
+#: ../src/nautilus-list-view.c:2659
 msgid "Choose the order of information to appear in this folder:"
 msgstr "Seleccione el orden en que aparecerá la información en esta carpeta:"
 
 # src/nautilus-location-bar.c:127
-#: ../src/nautilus-location-entry.c:255
+#: ../src/nautilus-location-entry.c:254
 #, c-format
 msgid "Do you want to view %d location?"
 msgid_plural "Do you want to view %d locations?"
 msgstr[0] "¿Quiere ver %d lugar?"
 msgstr[1] "¿Quiere ver los %d lugares?"
 
-#: ../src/nautilus-location-entry.c:259 ../src/nautilus-mime-actions.c:974
+#: ../src/nautilus-location-entry.c:258 ../src/nautilus-mime-actions.c:965
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
@@ -3745,90 +3834,90 @@ msgstr[0] "Esto abrirá %d ventana separada."
 msgstr[1] "Esto abrirá %d ventanas separadas."
 
 # src/file-manager/fm-properties-window.c:844
-#: ../src/nautilus-mime-actions.c:95
+#: ../src/nautilus-mime-actions.c:93
 #: ../src/resources/ui/nautilus-search-popover.ui.h:11
 msgid "Anything"
 msgstr "Cualquier cosa"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../src/nautilus-mime-actions.c:106 ../src/nautilus-properties-window.c:4199
+#: ../src/nautilus-mime-actions.c:104 ../src/nautilus-properties-window.c:4162
 msgid "Folders"
 msgstr "Carpetas"
 
 # src/file-manager/fm-directory-view.c:1865
-#: ../src/nautilus-mime-actions.c:111
+#: ../src/nautilus-mime-actions.c:109
 msgid "Documents"
 msgstr "Documentos"
 
-#: ../src/nautilus-mime-actions.c:129
+#: ../src/nautilus-mime-actions.c:127
 msgid "Illustration"
 msgstr "Ilustración"
 
-#: ../src/nautilus-mime-actions.c:143
+#: ../src/nautilus-mime-actions.c:141
 msgid "Music"
 msgstr "Música"
 
-#: ../src/nautilus-mime-actions.c:158
+#: ../src/nautilus-mime-actions.c:156
 msgid "PDF / PostScript"
 msgstr "PDF / PostScript"
 
-#: ../src/nautilus-mime-actions.c:166
+#: ../src/nautilus-mime-actions.c:164
 msgid "Picture"
 msgstr "Imagen"
 
 # src/file-manager/fm-properties-window.c:1563
-#: ../src/nautilus-mime-actions.c:211
+#: ../src/nautilus-mime-actions.c:209
 msgid "Text File"
 msgstr "Archivo de texto"
 
-#: ../src/nautilus-mime-actions.c:544
+#: ../src/nautilus-mime-actions.c:542
 #, c-format
 msgid "The link “%s” is broken. Move it to Trash?"
 msgstr "El enlace «%s» está roto. ¿Quiere moverlo a la papelera?"
 
-#: ../src/nautilus-mime-actions.c:546
+#: ../src/nautilus-mime-actions.c:544
 #, c-format
 msgid "The link “%s” is broken."
 msgstr "El enlace «%s» está roto."
 
-#: ../src/nautilus-mime-actions.c:552
+#: ../src/nautilus-mime-actions.c:550
 msgid "This link cannot be used because it has no target."
 msgstr "Este enlace no se puede usar porque no tiene destino."
 
-#: ../src/nautilus-mime-actions.c:554
+#: ../src/nautilus-mime-actions.c:552
 #, c-format
 msgid "This link cannot be used because its target “%s” doesn't exist."
 msgstr "Este enlace no se puede usar, porque su destino «%s» no existe."
 
 # src/file-manager/fm-directory-view.c:2145
-#: ../src/nautilus-mime-actions.c:564
+#: ../src/nautilus-mime-actions.c:562
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:27
 msgid "Mo_ve to Trash"
 msgstr "_Mover a la papelera"
 
-#: ../src/nautilus-mime-actions.c:624
+#: ../src/nautilus-mime-actions.c:622
 #, c-format
 msgid "Do you want to run “%s”, or display its contents?"
 msgstr "¿Quiere ejecutar «%s» o ver su contenido?"
 
-#: ../src/nautilus-mime-actions.c:626
+#: ../src/nautilus-mime-actions.c:624
 #, c-format
 msgid "“%s” is an executable text file."
 msgstr "«%s» es un archivo de texto ejecutable."
 
 # src/file-manager/fm-desktop-icon-view.c:222
-#: ../src/nautilus-mime-actions.c:632
+#: ../src/nautilus-mime-actions.c:630
 msgid "Run in _Terminal"
 msgstr "Ejecutar en un _terminal"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
-#: ../src/nautilus-mime-actions.c:633
+#: ../src/nautilus-mime-actions.c:631
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: ../src/nautilus-mime-actions.c:971
+#: ../src/nautilus-mime-actions.c:962
 #, c-format
 msgid "This will open %d separate tab."
 msgid_plural "This will open %d separate tabs."
@@ -3836,34 +3925,34 @@ msgstr[0] "Esto abrirá %d pestaña separada."
 msgstr[1] "Esto abrirá %d pestañas separadas."
 
 # src/nautilus-window-manage-views.c:1299
-#: ../src/nautilus-mime-actions.c:1036
+#: ../src/nautilus-mime-actions.c:1027
 #, c-format
 msgid "Could not display “%s”."
 msgstr "No se pudo mostrar «%s»."
 
-#: ../src/nautilus-mime-actions.c:1134
+#: ../src/nautilus-mime-actions.c:1125
 msgid "The file is of an unknown type"
 msgstr "El archivo es de un tipo desconocido"
 
-#: ../src/nautilus-mime-actions.c:1138
+#: ../src/nautilus-mime-actions.c:1128
 #, c-format
 msgid "There is no application installed for “%s” files"
 msgstr "No existe una aplicación instalada para los archivos «%s»"
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: ../src/nautilus-mime-actions.c:1153
+#: ../src/nautilus-mime-actions.c:1141
 msgid "_Select Application"
 msgstr "_Seleccionar aplicación"
 
-#: ../src/nautilus-mime-actions.c:1189
+#: ../src/nautilus-mime-actions.c:1177
 msgid "There was an internal error trying to search for applications:"
 msgstr "Hubo un error interno al intentar buscar aplicaciones:"
 
-#: ../src/nautilus-mime-actions.c:1191
+#: ../src/nautilus-mime-actions.c:1179
 msgid "Unable to search for application"
 msgstr "No se pudo buscar una aplicación"
 
-#: ../src/nautilus-mime-actions.c:1314
+#: ../src/nautilus-mime-actions.c:1302
 #, c-format
 msgid ""
 "There is no application installed for “%s” files.\n"
@@ -3872,11 +3961,11 @@ msgstr ""
 "No existe una aplicación instalada para los archivos «%s».\n"
 "¿Quiere buscar una aplicación para abrir este archivo?"
 
-#: ../src/nautilus-mime-actions.c:1464
+#: ../src/nautilus-mime-actions.c:1452
 msgid "Untrusted application launcher"
 msgstr "Lanzador de aplicación sin confianza"
 
-#: ../src/nautilus-mime-actions.c:1467
+#: ../src/nautilus-mime-actions.c:1455
 #, c-format
 msgid ""
 "The application launcher “%s” has not been marked as trusted. If you do not "
@@ -3885,15 +3974,15 @@ msgstr ""
 "El lanzador de la aplicación «%s» no se ha marcado como confiado. Si no "
 "conoce el origen de este archivo, lanzarlo puede no ser seguro."
 
-#: ../src/nautilus-mime-actions.c:1482
+#: ../src/nautilus-mime-actions.c:1470
 msgid "_Launch Anyway"
 msgstr "_Lanzar de todas formas"
 
-#: ../src/nautilus-mime-actions.c:1485
+#: ../src/nautilus-mime-actions.c:1473
 msgid "Mark as _Trusted"
 msgstr "Marcar como de con_fianza"
 
-#: ../src/nautilus-mime-actions.c:1714
+#: ../src/nautilus-mime-actions.c:1703
 #, c-format
 msgid "This will open %d separate application."
 msgid_plural "This will open %d separate applications."
@@ -3901,81 +3990,80 @@ msgstr[0] "Esto abrirá %d aplicación separada."
 msgstr[1] "Esto abrirá %d aplicaciones separadas."
 
 #. if it wasn't cancelled show a dialog
-#: ../src/nautilus-mime-actions.c:1791 ../src/nautilus-mime-actions.c:2055
-#: ../src/gtk/gtkplacesview.c:1165 ../src/gtk/gtkplacesview.c:1209
-#: ../src/gtk/gtkplacesview.c:1260
+#: ../src/nautilus-mime-actions.c:1780 ../src/nautilus-mime-actions.c:2044
+#: ../src/gtk/nautilusgtkplacesview.c:1162
+#: ../src/gtk/nautilusgtkplacesview.c:1235
 msgid "Unable to access location"
 msgstr "No se pudo acceder al lugar"
 
-#: ../src/nautilus-mime-actions.c:2134
+#: ../src/nautilus-mime-actions.c:2123
 msgid "Unable to start location"
 msgstr "No se pudo iniciar el lugar"
 
-#: ../src/nautilus-mime-actions.c:2218
+#: ../src/nautilus-mime-actions.c:2207
 #, c-format
 msgid "Opening “%s”."
 msgstr "Abriendo «%s»."
 
 # src/file-manager/fm-icon-view.c:1277
-#: ../src/nautilus-mime-actions.c:2221
+#: ../src/nautilus-mime-actions.c:2210
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
 msgstr[0] "Abriendo %d elemento."
 msgstr[1] "Abriendo %d elementos."
 
-#: ../src/nautilus-notebook.c:322
+#: ../src/nautilus-notebook.c:320
 msgid "Close tab"
 msgstr "Cerrar pestaña"
 
 # src/file-manager/fm-icon-text-window.c:85
 #. Translators: this is referred to captions under icons.
-#: ../src/nautilus-preferences-window.c:155
-#: ../src/nautilus-properties-window.c:3772
-#: ../src/nautilus-properties-window.c:3799
+#: ../src/nautilus-preferences-window.c:131
+#: ../src/nautilus-properties-window.c:3735
+#: ../src/nautilus-properties-window.c:3762
 msgid "None"
 msgstr "Ninguno"
 
 # src/file-manager/fm-properties-window.c:1493
-#: ../src/nautilus-progress-persistence-handler.c:130
-#: ../src/nautilus-progress-persistence-handler.c:201
+#: ../src/nautilus-progress-persistence-handler.c:101
+#: ../src/nautilus-progress-persistence-handler.c:140
 msgid "File Operations"
 msgstr "Operaciones sobre archivos"
 
-#: ../src/nautilus-progress-persistence-handler.c:132
+#: ../src/nautilus-progress-persistence-handler.c:103
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
-#: ../src/nautilus-progress-persistence-handler.c:135
-#: ../src/nautilus-progress-persistence-handler.c:155
+#: ../src/nautilus-progress-persistence-handler.c:106
 #, c-format
 msgid "%'d file operation active"
 msgid_plural "%'d file operations active"
 msgstr[0] "%'d operación sobre archivos activa"
 msgstr[1] "%'d operaciones sobre archivos activas"
 
-#: ../src/nautilus-progress-persistence-handler.c:203
+#: ../src/nautilus-progress-persistence-handler.c:142
 msgid "All file operations have been successfully completed"
 msgstr "Todas las operaciones sobre los archivos se han completado con éxito"
 
-#: ../src/nautilus-properties-window.c:491
+#: ../src/nautilus-properties-window.c:465
 msgid "You cannot assign more than one custom icon at a time!"
 msgstr "No puede asignar más de un icono personalizado a la vez."
 
-#: ../src/nautilus-properties-window.c:492
+#: ../src/nautilus-properties-window.c:466
 msgid "Please drop just one image to set a custom icon."
 msgstr "Arrastre sólo una imagen para establecerla como icono personalizado."
 
-#: ../src/nautilus-properties-window.c:503
+#: ../src/nautilus-properties-window.c:477
 msgid "The file that you dropped is not local."
 msgstr "El archivo que ha soltado no es local."
 
-#: ../src/nautilus-properties-window.c:504
-#: ../src/nautilus-properties-window.c:510
+#: ../src/nautilus-properties-window.c:478
+#: ../src/nautilus-properties-window.c:484
 msgid "You can only use local images as custom icons."
 msgstr "Solamente puede usar imágenes locales como iconos personalizados."
 
-#: ../src/nautilus-properties-window.c:509
+#: ../src/nautilus-properties-window.c:483
 msgid "The file that you dropped is not an image."
 msgstr "El archivo que ha soltado no es una imagen."
 
@@ -3984,21 +4072,21 @@ msgstr "El archivo que ha soltado no es una imagen."
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: ../src/nautilus-properties-window.c:624
+#: ../src/nautilus-properties-window.c:598
 msgid "_Name:"
 msgid_plural "_Names:"
 msgstr[0] "_Nombre:"
 msgstr[1] "_Nombres:"
 
 # src/file-manager/fm-directory-view.c:2151
-#: ../src/nautilus-properties-window.c:819
+#: ../src/nautilus-properties-window.c:793
 #, c-format
 msgid "Properties"
 msgstr "Propiedades"
 
 # src/file-manager/fm-directory-view.c:2151
 #. To translators: %s is the name of the folder.
-#: ../src/nautilus-properties-window.c:829
+#: ../src/nautilus-properties-window.c:803
 #, c-format
 msgctxt "folder"
 msgid "%s Properties"
@@ -4006,40 +4094,40 @@ msgstr "Propiedades de %s"
 
 # src/file-manager/fm-directory-view.c:2151
 #. To translators: %s is the name of the file.
-#: ../src/nautilus-properties-window.c:832
+#: ../src/nautilus-properties-window.c:806
 #, c-format
 msgctxt "file"
 msgid "%s Properties"
 msgstr "Propiedades de %s"
 
-#: ../src/nautilus-properties-window.c:1226
+#: ../src/nautilus-properties-window.c:1200
 #, c-format
 msgctxt "MIME type description (MIME type)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # src/file-manager/fm-properties-window.c:542
-#: ../src/nautilus-properties-window.c:1428
+#: ../src/nautilus-properties-window.c:1402
 msgid "Cancel Group Change?"
 msgstr "¿Cancelar el cambio de grupo?"
 
 # src/file-manager/fm-properties-window.c:687
-#: ../src/nautilus-properties-window.c:1825
+#: ../src/nautilus-properties-window.c:1792
 msgid "Cancel Owner Change?"
 msgstr "¿Cancelar el cambio de propietario?"
 
 # src/file-manager/fm-properties-window.c:844
-#: ../src/nautilus-properties-window.c:2124
+#: ../src/nautilus-properties-window.c:2091
 msgid "nothing"
 msgstr "nada"
 
 # src/file-manager/fm-properties-window.c:846
-#: ../src/nautilus-properties-window.c:2126
+#: ../src/nautilus-properties-window.c:2093
 msgid "unreadable"
 msgstr "ilegible"
 
 # src/file-manager/fm-properties-window.c:856
-#: ../src/nautilus-properties-window.c:2134
+#: ../src/nautilus-properties-window.c:2101
 #, c-format
 msgid "%'d item, with size %s"
 msgid_plural "%'d items, totalling %s"
@@ -4047,7 +4135,7 @@ msgstr[0] "%'d elemento, con un tamaño de %s"
 msgstr[1] "%'d elementos, %s en total"
 
 # src/file-manager/fm-properties-window.c:864
-#: ../src/nautilus-properties-window.c:2143
+#: ../src/nautilus-properties-window.c:2110
 msgid "(some contents unreadable)"
 msgstr "(algunos contenidos son ilegibles)"
 
@@ -4058,67 +4146,67 @@ msgstr "(algunos contenidos son ilegibles)"
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #.
-#: ../src/nautilus-properties-window.c:2160
+#: ../src/nautilus-properties-window.c:2127
 msgid "Contents:"
 msgstr "Contenido:"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:2770
+#: ../src/nautilus-properties-window.c:2737
 msgid "used"
 msgstr "usado"
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:2780
+#: ../src/nautilus-properties-window.c:2747
 msgid "free"
 msgstr "libre"
 
-#: ../src/nautilus-properties-window.c:2782
+#: ../src/nautilus-properties-window.c:2749
 msgid "Total capacity:"
 msgstr "Capacidad total:"
 
-#: ../src/nautilus-properties-window.c:2785
+#: ../src/nautilus-properties-window.c:2752
 msgid "Filesystem type:"
 msgstr "Tipo del sistema de archivos:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1031
-#: ../src/nautilus-properties-window.c:2921
+#: ../src/nautilus-properties-window.c:2887
 msgid "Basic"
 msgstr "Básico"
 
 # src/nautilus-link-set-window.c:185
-#: ../src/nautilus-properties-window.c:2986
+#: ../src/nautilus-properties-window.c:2949
 msgid "Link target:"
 msgstr "Destino del enlace:"
 
-#: ../src/nautilus-properties-window.c:3005
+#: ../src/nautilus-properties-window.c:2968
 msgid "Parent Folder:"
 msgstr "Carpeta padre:"
 
-#: ../src/nautilus-properties-window.c:3013
+#: ../src/nautilus-properties-window.c:2976
 msgid "Volume:"
 msgstr "Volumen:"
 
 # src/file-manager/fm-properties-window.c:1105
-#: ../src/nautilus-properties-window.c:3022
+#: ../src/nautilus-properties-window.c:2985
 msgid "Accessed:"
 msgstr "Accedido:"
 
 # src/file-manager/fm-properties-window.c:1103
-#: ../src/nautilus-properties-window.c:3026
+#: ../src/nautilus-properties-window.c:2989
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: ../src/nautilus-properties-window.c:3036
+#: ../src/nautilus-properties-window.c:2999
 msgid "Free space:"
 msgstr "Espacio libre:"
 
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #.
-#: ../src/nautilus-properties-window.c:3689
-#: ../src/nautilus-properties-window.c:3700
-#: ../src/nautilus-properties-window.c:3712
+#: ../src/nautilus-properties-window.c:3652
+#: ../src/nautilus-properties-window.c:3663
+#: ../src/nautilus-properties-window.c:3675
 msgid "no "
 msgstr "no "
 
@@ -4126,232 +4214,249 @@ msgstr "no "
 # libnautilus-private/nautilus-search-bar-criterion.c:71
 # libnautilus-private/nautilus-search-bar-criterion.c:86
 # libnautilus-private/nautilus-search-bar-criterion.c:141
-#: ../src/nautilus-properties-window.c:3692
+#: ../src/nautilus-properties-window.c:3655
 msgid "list"
 msgstr "lista"
 
 # src/file-manager/fm-properties-window.c:1573
-#: ../src/nautilus-properties-window.c:3694
+#: ../src/nautilus-properties-window.c:3657
 msgid "read"
 msgstr "lectura"
 
-#: ../src/nautilus-properties-window.c:3703
+#: ../src/nautilus-properties-window.c:3666
 msgid "create/delete"
 msgstr "creación/eliminación"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1577
-#: ../src/nautilus-properties-window.c:3705
+#: ../src/nautilus-properties-window.c:3668
 msgid "write"
 msgstr "escritura"
 
-#: ../src/nautilus-properties-window.c:3714
+#: ../src/nautilus-properties-window.c:3677
 msgid "access"
 msgstr "acceso"
 
-#: ../src/nautilus-properties-window.c:3779
+#: ../src/nautilus-properties-window.c:3742
 msgid "List files only"
 msgstr "Sólo listar archivos"
 
 # src/file-manager/fm-properties-window.c:1105
-#: ../src/nautilus-properties-window.c:3785
+#: ../src/nautilus-properties-window.c:3748
 msgid "Access files"
 msgstr "Acceder a archivos"
 
 # src/file-manager/dfos-xfer.c:713
-#: ../src/nautilus-properties-window.c:3791
+#: ../src/nautilus-properties-window.c:3754
 msgid "Create and delete files"
 msgstr "Crear y eliminar archivos"
 
-#: ../src/nautilus-properties-window.c:3806
+#: ../src/nautilus-properties-window.c:3769
 msgid "Read-only"
 msgstr "Sólo lectura"
 
 # libnautilus-private/nautilus-undo-signal-handlers.c:177
-#: ../src/nautilus-properties-window.c:3812
+#: ../src/nautilus-properties-window.c:3775
 msgid "Read and write"
 msgstr "Lectura y escritura"
 
 # src/file-manager/fm-properties-window.c:1105
-#: ../src/nautilus-properties-window.c:3839
+#: ../src/nautilus-properties-window.c:3802
 msgid "Access:"
 msgstr "Acceso:"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ../src/nautilus-properties-window.c:3841
+#: ../src/nautilus-properties-window.c:3804
 msgid "Folder access:"
 msgstr "Acceso a carpeta:"
 
 # src/file-manager/fm-properties-window.c:1105
-#: ../src/nautilus-properties-window.c:3843
+#: ../src/nautilus-properties-window.c:3806
 msgid "File access:"
 msgstr "Acceso a archivo:"
 
 # src/file-manager/fm-properties-window.c:1554
-#: ../src/nautilus-properties-window.c:3932
+#: ../src/nautilus-properties-window.c:3895
 msgid "_Owner:"
 msgstr "_Propietario:"
 
 # src/file-manager/fm-properties-window.c:1554
-#: ../src/nautilus-properties-window.c:3940
-#: ../src/nautilus-properties-window.c:4202
+#: ../src/nautilus-properties-window.c:3903
+#: ../src/nautilus-properties-window.c:4165
 msgid "Owner:"
 msgstr "Propietario:"
 
 # src/file-manager/fm-properties-window.c:1557
-#: ../src/nautilus-properties-window.c:3962
+#: ../src/nautilus-properties-window.c:3925
 msgid "_Group:"
 msgstr "_Grupo:"
 
 # src/file-manager/fm-properties-window.c:1557
-#: ../src/nautilus-properties-window.c:3970
-#: ../src/nautilus-properties-window.c:4216
+#: ../src/nautilus-properties-window.c:3933
+#: ../src/nautilus-properties-window.c:4179
 msgid "Group:"
 msgstr "Grupo:"
 
 # src/file-manager/fm-properties-window.c:1560
-#: ../src/nautilus-properties-window.c:3991
+#: ../src/nautilus-properties-window.c:3954
 msgid "Others"
 msgstr "Otros"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1581
-#: ../src/nautilus-properties-window.c:4006
+#: ../src/nautilus-properties-window.c:3969
 msgid "Execute:"
 msgstr "Ejecución:"
 
-#: ../src/nautilus-properties-window.c:4009
+#: ../src/nautilus-properties-window.c:3972
 msgid "Allow _executing file as program"
 msgstr "Permitir _ejecutar el archivo como un programa"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-properties-window.c:4185
+#: ../src/nautilus-properties-window.c:4148
 msgid "Change Permissions for Enclosed Files"
 msgstr "Cambiar permisos a los archivos contenidos"
 
-#: ../src/nautilus-properties-window.c:4189
+#: ../src/nautilus-properties-window.c:4152
 msgid "Change"
 msgstr "Cambiar"
 
 # src/file-manager/fm-properties-window.c:1560
-#: ../src/nautilus-properties-window.c:4230
+#: ../src/nautilus-properties-window.c:4193
 msgid "Others:"
 msgstr "Otros:"
 
 # src/file-manager/fm-properties-window.c:1499
-#: ../src/nautilus-properties-window.c:4271
+#: ../src/nautilus-properties-window.c:4234
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr "Usted no es el propietario, por eso no puede cambiar estos permisos."
 
-#: ../src/nautilus-properties-window.c:4286
+#: ../src/nautilus-properties-window.c:4249
 msgid "Security context:"
 msgstr "Contexto de seguridad:"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-properties-window.c:4301
+#: ../src/nautilus-properties-window.c:4264
 msgid "Change Permissions for Enclosed Files…"
 msgstr "Cambiar permisos a los archivos contenidos…"
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-properties-window.c:4311
+#: ../src/nautilus-properties-window.c:4274
 #, c-format
 msgid "The permissions of “%s” could not be determined."
 msgstr "Los permisos de «%s» no se han podido determinar."
 
 # src/file-manager/fm-properties-window.c:1641
-#: ../src/nautilus-properties-window.c:4314
+#: ../src/nautilus-properties-window.c:4277
 msgid "The permissions of the selected file could not be determined."
 msgstr "Los permisos del archivo seleccionado no se han podido determinar."
 
 # src/file-manager/fm-directory-view.c:2117
-#: ../src/nautilus-properties-window.c:4562
+#: ../src/nautilus-properties-window.c:4529
 msgid "Open With"
 msgstr "Abrir con"
 
 # libnautilus-private/nautilus-global-preferences.c:750
-#: ../src/nautilus-properties-window.c:4883
+#: ../src/nautilus-properties-window.c:4858
 msgid "Creating Properties window."
 msgstr "Creando ventana de propiedades."
 
-#: ../src/nautilus-properties-window.c:5167
+#: ../src/nautilus-properties-window.c:5142
 msgid "Select Custom Icon"
 msgstr "Seleccione el icono personalizado"
 
 # libnautilus-private/nautilus-global-preferences.c:592
-#: ../src/nautilus-properties-window.c:5169
+#: ../src/nautilus-properties-window.c:5144
 msgid "_Revert"
 msgstr "_Revertir"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
 #. Open item is always present
-#: ../src/nautilus-properties-window.c:5171 ../src/gtk/gtkplacesview.c:1602
+#: ../src/nautilus-properties-window.c:5146
+#: ../src/gtk/nautilusgtkplacesview.c:1577
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/nautilus-query-editor.c:122
+#: ../src/nautilus-query-editor.c:121
 msgid "Searching locations only"
 msgstr "Buscando sólo ubicaciones"
 
-#: ../src/nautilus-query-editor.c:124
+#: ../src/nautilus-query-editor.c:123
 msgid "Searching devices only"
 msgstr "Buscando sólo dispositivos"
 
-#: ../src/nautilus-query-editor.c:126
+#: ../src/nautilus-query-editor.c:125
 msgid "Searching network locations only"
 msgstr "Buscando sólo ubicaciones de red"
 
-#: ../src/nautilus-query-editor.c:129
+#: ../src/nautilus-query-editor.c:128
 msgid "Remote location - only searching the current folder"
 msgstr "Ubicación remota: buscando solo en la carpeta actual"
 
-#: ../src/nautilus-query-editor.c:131
+#: ../src/nautilus-query-editor.c:130
 msgid "Only searching the current folder"
 msgstr "Buscando solo en la carpeta actual"
 
-#: ../src/nautilus-search-popover.c:282
+#: ../src/nautilus-search-popover.c:284
 msgid "Show a list to select the date"
 msgstr "Mostrar una lista para seleccionar la fecha"
 
-#: ../src/nautilus-search-popover.c:288
+#: ../src/nautilus-search-popover.c:290
 #: ../src/resources/ui/nautilus-search-popover.ui.h:5
 msgid "Show a calendar to select the date"
 msgstr "Mostrar un calendario para seleccionar la fecha"
 
+#. Add the no date filter element first
+#: ../src/nautilus-search-popover.c:387
+msgid "Any time"
+msgstr "En cualquier momento"
+
 #. Other types
-#: ../src/nautilus-search-popover.c:472
+#: ../src/nautilus-search-popover.c:476
 msgid "Other Type…"
 msgstr "Otro tipo…"
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: ../src/nautilus-search-popover.c:532
+#: ../src/nautilus-search-popover.c:536
 msgid "Select type"
 msgstr "Seleccione el tipo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: ../src/nautilus-search-popover.c:536
+#: ../src/nautilus-search-popover.c:540
 msgid "Select"
 msgstr "Seleccionar"
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: ../src/nautilus-search-popover.c:621
+#: ../src/nautilus-search-popover.c:625
 #: ../src/resources/ui/nautilus-search-popover.ui.h:3
 msgid "Select Dates…"
 msgstr "Seleccionar fechas…"
 
 #. trash
-#: ../src/nautilus-shell-search-provider.c:297 ../src/nautilus-trash-bar.c:198
+#: ../src/nautilus-shell-search-provider.c:297 ../src/nautilus-trash-bar.c:197
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:45
 msgid "Trash"
 msgstr "Papelera"
 
-#: ../src/nautilus-special-location-bar.c:51
-msgid "Files in this folder will appear in the New Document menu."
-msgstr "Los archivos de esta carpeta aparecerán en el menú «Nuevo documento»."
+#: ../src/nautilus-special-location-bar.c:53
+#| msgid "Files in this folder will appear in the New Document menu."
+msgid "Put files in this folder to use them as templates for new documents."
+msgstr ""
+"Copie archivos en esta carpeta para usarlos como plantillas para documentos "
+"nuevos."
 
 #: ../src/nautilus-special-location-bar.c:54
+msgid ""
+"<a href=\"help:gnome-help/files-templates\" title=\"GNOME help for templates"
+"\">Learn more…</a>"
+msgstr ""
+"<a href=\"help:gnome-help/files-templates\" title=\"GNOME help for templates"
+"\">Aprender más…</a>"
+
+#: ../src/nautilus-special-location-bar.c:57
 msgid "Executable files in this folder will appear in the Scripts menu."
 msgstr ""
 "Todos los archivos ejecutables en esta carpeta aparecerán en el menú "
@@ -4359,37 +4464,37 @@ msgstr ""
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:372
-#: ../src/nautilus-trash-bar.c:206
+#: ../src/nautilus-trash-bar.c:205
 msgid "_Restore"
 msgstr "_Restaurar"
 
 # src/file-manager/fm-icon-view.c:318
-#: ../src/nautilus-trash-bar.c:209
+#: ../src/nautilus-trash-bar.c:208
 msgid "Restore selected items to their original position"
 msgstr "Restaurar los elementos seleccionados a su lugar original"
 
 #. Translators: "Empty" is an action (for the trash) , not a state
-#: ../src/nautilus-trash-bar.c:213
+#: ../src/nautilus-trash-bar.c:212
 msgid "_Empty"
 msgstr "_Vaciar"
 
 # src/file-manager/fm-directory-view.c:2669
-#: ../src/nautilus-trash-bar.c:216
+#: ../src/nautilus-trash-bar.c:215
 msgid "Delete all items in the Trash"
 msgstr "Eliminar todos los elementos en la papelera"
 
 # src/file-manager/fm-directory-view.c:2151
-#: ../src/nautilus-window.c:1226
+#: ../src/nautilus-window.c:1377
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../src/nautilus-window.c:1236
+#: ../src/nautilus-window.c:1387
 msgid "_Format…"
 msgstr "_Formatear…"
 
 # src/file-manager/fm-directory-view.c:1015
 #. Translators: only one item has been deleted and %s is its name.
-#: ../src/nautilus-window.c:1490
+#: ../src/nautilus-window.c:1643
 #, c-format
 msgid "“%s” deleted"
 msgstr "«%s» eliminado"
@@ -4397,7 +4502,7 @@ msgstr "«%s» eliminado"
 # src/file-manager/fm-directory-view.c:1020
 #. Translators: one or more items might have been deleted, and %d
 #. * is the count.
-#: ../src/nautilus-window.c:1495
+#: ../src/nautilus-window.c:1648
 #, c-format
 msgid "%d file deleted"
 msgid_plural "%d files deleted"
@@ -4405,29 +4510,29 @@ msgstr[0] "%d archivo eliminado"
 msgstr[1] "%d archivos eliminados"
 
 # src/nautilus-sidebar.c:1145
-#: ../src/nautilus-window.c:1595
+#: ../src/nautilus-window.c:1750
 #, c-format
 msgid "Open %s"
 msgstr "Abrir %s"
 
-#: ../src/nautilus-window.c:1683
+#: ../src/nautilus-window.c:1838
 msgid "_New Tab"
 msgstr "_Pestaña nueva"
 
-#: ../src/nautilus-window.c:1693
+#: ../src/nautilus-window.c:1848
 msgid "Move Tab _Left"
 msgstr "Mover pestaña a la _izquierda"
 
-#: ../src/nautilus-window.c:1701
+#: ../src/nautilus-window.c:1856
 msgid "Move Tab _Right"
 msgstr "Mover pestaña a la _derecha"
 
-#: ../src/nautilus-window.c:1712
+#: ../src/nautilus-window.c:1867
 msgid "_Close Tab"
 msgstr "_Cerrar pestaña"
 
 # src/file-manager/fm-properties-window.c:1105
-#: ../src/nautilus-window.c:2636
+#: ../src/nautilus-window.c:2789
 msgid "Access and organize your files."
 msgstr "Acceder a sus archivos y organizarlos."
 
@@ -4435,7 +4540,7 @@ msgstr "Acceder a sus archivos y organizarlos."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: ../src/nautilus-window.c:2645
+#: ../src/nautilus-window.c:2798
 msgid "translator-credits"
 msgstr ""
 "Daniel Mustieles <daniel.musiteles@gmail.com>, 2010 - 2016\n"
@@ -4446,38 +4551,38 @@ msgstr ""
 "Ismael Olea <ismael@olea.org>, 2001\n"
 "Jorge Carrasquilla Soares <jorge@conectiva.com.br>, 2000"
 
-#: ../src/nautilus-window-slot.c:1117
+#: ../src/nautilus-window-slot.c:1192
 msgid "Unable to display the contents of this folder."
 msgstr "No se pudo mostrar el contenido de esta carpeta."
 
 # src/nautilus-window-menus.c:602
-#: ../src/nautilus-window-slot.c:1119
+#: ../src/nautilus-window-slot.c:1194
 msgid "This location doesn't appear to be a folder."
 msgstr "Este lugar no es una carpeta."
 
 # src/nautilus-window-manage-views.c:1241
-#: ../src/nautilus-window-slot.c:1124
+#: ../src/nautilus-window-slot.c:1199
 msgid ""
 "Unable to find the requested file. Please check the spelling and try again."
 msgstr ""
 "No se pudo encontrar el archivo solicitado. Compruebe que lo ha escrito bien "
 "e inténtelo de nuevo."
 
-#: ../src/nautilus-window-slot.c:1129
+#: ../src/nautilus-window-slot.c:1204
 #, c-format
 msgid "“%s” locations are not supported."
 msgstr "«%s» lugares no soportados"
 
 # src/nautilus-window-manage-views.c:1281
-#: ../src/nautilus-window-slot.c:1132
+#: ../src/nautilus-window-slot.c:1207
 msgid "Unable to handle this kind of location."
 msgstr "No se puede manejar este tipo de lugar."
 
-#: ../src/nautilus-window-slot.c:1137
+#: ../src/nautilus-window-slot.c:1212
 msgid "Unable to access the requested location."
 msgstr "No se pudo acceder al lugar solicitado."
 
-#: ../src/nautilus-window-slot.c:1140
+#: ../src/nautilus-window-slot.c:1215
 msgid "Don't have permission to access the requested location."
 msgstr "No tiene permiso para acceder al lugar de destino."
 
@@ -4486,7 +4591,7 @@ msgstr "No tiene permiso para acceder al lugar de destino."
 #. * But this case is also hit for legitimate web addresses when
 #. * the proxy is set up wrong.
 #.
-#: ../src/nautilus-window-slot.c:1148
+#: ../src/nautilus-window-slot.c:1223
 msgid ""
 "Unable to find the requested location. Please check the spelling or the "
 "network settings."
@@ -4494,74 +4599,18 @@ msgstr ""
 "No se pudo encontrar el lugar solicitado. Compruebe que lo ha escrito bien o "
 "la configuración de la red."
 
-#: ../src/nautilus-window-slot.c:1159
+#: ../src/nautilus-window-slot.c:1234
 #, c-format
 msgid "Unhandled error message: %s"
 msgstr "Mensaje de error no manejado: %s"
 
-#: ../src/nautilus-window-slot.c:1307
+#: ../src/nautilus-window-slot.c:1388
 #, c-format
 msgid "Unable to load location"
 msgstr "No se pudo cargar el lugar"
 
-#: ../src/nautilus-x-content-bar.c:92
-msgid "Audio CD"
-msgstr "CD de música"
-
-#: ../src/nautilus-x-content-bar.c:94
-msgid "Audio DVD"
-msgstr "DVD de música"
-
-#: ../src/nautilus-x-content-bar.c:96
-msgid "Video DVD"
-msgstr "DVD de vídeo"
-
-#: ../src/nautilus-x-content-bar.c:98
-msgid "Video CD"
-msgstr "CD de vídeo"
-
-#: ../src/nautilus-x-content-bar.c:100
-msgid "Super Video CD"
-msgstr "CD de super vídeo"
-
-#: ../src/nautilus-x-content-bar.c:102
-msgid "Photo CD"
-msgstr "CD de Fotos"
-
-#: ../src/nautilus-x-content-bar.c:104
-msgid "Picture CD"
-msgstr "CD de imágenes"
-
-#: ../src/nautilus-x-content-bar.c:106 ../src/nautilus-x-content-bar.c:139
-msgid "Contains digital photos"
-msgstr "Contiene fotos digitales."
-
-#: ../src/nautilus-x-content-bar.c:108
-msgid "Contains music"
-msgstr "Contiene música"
-
-#: ../src/nautilus-x-content-bar.c:110
-msgid "Contains software"
-msgstr "Contiene software"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#. fallback to generic greeting
-#: ../src/nautilus-x-content-bar.c:113
-#, c-format
-msgid "Detected as “%s”"
-msgstr "Detectado como «%s»"
-
-#: ../src/nautilus-x-content-bar.c:135
-msgid "Contains music and photos"
-msgstr "Contiene música y fotos"
-
-#: ../src/nautilus-x-content-bar.c:137
-msgid "Contains photos and music"
-msgstr "Contiene fotos y música"
-
 # src/file-manager/fm-directory-view.c:2117
-#: ../src/nautilus-x-content-bar.c:201
+#: ../src/nautilus-x-content-bar.c:123
 msgid "Open with:"
 msgstr "Abrir con:"
 
@@ -4990,13 +5039,13 @@ msgid "Open With Other _Application"
 msgstr "Abrir con _otra aplicación"
 
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:16
-#: ../src/gtk/gtkplacesview.c:1657
+#: ../src/gtk/nautilusgtkplacesview.c:1632
 msgid "_Mount"
 msgstr "_Montar"
 
 # components/html/gnome-dialogs.c:234
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:17
-#: ../src/gtk/gtkplacesview.c:1647
+#: ../src/gtk/nautilusgtkplacesview.c:1622
 msgid "_Unmount"
 msgstr "_Desmontar"
 
@@ -5112,7 +5161,7 @@ msgid "No Results Found"
 msgstr "No se encontraron resultados"
 
 #: ../src/resources/ui/nautilus-no-search-results.ui.h:2
-#: ../src/gtk/gtkplacesview.ui.h:5
+#: ../src/gtk/nautilusgtkplacesview.ui.h:5
 msgid "Try a different search"
 msgstr "Pruebe una búsqueda diferente"
 
@@ -5213,9 +5262,12 @@ msgstr "2 GB"
 msgid "4 GB"
 msgstr "4 GB"
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/nautilus-first-time-druid.c:272
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:25
-msgid "Files Preferences"
-msgstr "Preferencias de archivos"
+#| msgid "Prefere_nces"
+msgid "Preferences"
+msgstr "Preferencias"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:26
 #: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:1
@@ -5227,21 +5279,18 @@ msgid "Sort _folders before files"
 msgstr "Colocar las carpetas _antes que los archivos"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:28
-#, fuzzy
 #| msgid "Only show folders in the tree side pane"
 msgid "Allow folders to be _expanded"
-msgstr "Mostrar las carpetas sólo en el árbol del panel lateral"
+msgstr "Permitir _expandir las carpetas"
 
 # src/nautilus-location-bar.c:401
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:29
-#, fuzzy
 #| msgid "Icon Captions"
 msgid "Icon View Captions"
-msgstr "Descripciones de iconos"
+msgstr "Descripciones de la vista de iconos"
 
 # src/file-manager/fm-icon-text-window.c:267
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:30
-#, fuzzy
 #| msgid ""
 #| "Choose the order of information to appear beneath icon names. More "
 #| "information will appear when zooming in closer."
@@ -5249,20 +5298,25 @@ msgid ""
 "Add information to be displayed beneath file and folder names.\n"
 "More information will appear when zooming closer."
 msgstr ""
-"Seleccione el orden en que la información aparecerá debajo de los nombres de "
-"los iconos. Aparecerá más información cuando aumente la ampliación."
+"Añada información para mostrarla debajo de los nombres de archivos y "
+"carpetas.\n"
+"Aparecerá más información cuando aumente la ampliación."
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:32
-#| msgid "%'d second"
-#| msgid_plural "%'d seconds"
+#| msgid "Second"
+msgctxt "the n-th position of an icon caption"
 msgid "Second"
 msgstr "Segundo"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:33
+#| msgid "Third"
+msgctxt "the n-th position of an icon caption"
 msgid "Third"
 msgstr "Tercero"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:34
+#| msgid "First"
+msgctxt "the n-th position of an icon caption"
 msgid "First"
 msgstr "Primero"
 
@@ -5273,7 +5327,6 @@ msgid "Views"
 msgstr "Vistas"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:36
-#| msgid "Open action menu"
 msgid "Open Action"
 msgstr "Abrir acción"
 
@@ -5287,14 +5340,14 @@ msgstr "_Doble pulsación para abrir los elementos"
 
 # src/nautilus-link-set-window.c:185
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:39
-#, fuzzy
 #| msgid "Link target:"
 msgid "Link Creation"
-msgstr "Destino del enlace:"
+msgstr "Creación de enlaces"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:40
-msgid "Allow creating symbolic _links"
-msgstr ""
+#| msgid "The target doesn't support symbolic links."
+msgid "Show action to create symbolic _links"
+msgstr "Mostrar una acción para crear en_laces simbólicos"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:41
 msgid "Executable Text Files"
@@ -5303,33 +5356,28 @@ msgstr "Archivos de texto ejecutables"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:42
-#, fuzzy
 #| msgid "_Display"
 msgid "_Display them"
-msgstr "_Mostrar"
+msgstr "_Mostrarlos"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:43
-#, fuzzy
 #| msgid "_Run"
 msgid "_Run them"
-msgstr "E_jecutar"
+msgstr "E_jecutarlos"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:44
-#| msgid "Ask what to do"
 msgid "_Ask what to do"
 msgstr "_Preguntar qué hacer"
 
 # src/file-manager/fm-directory-view.c:2669
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:46
-#| msgid "Ask before _emptying the Trash or deleting files"
 msgid "Ask before _emptying the Trash"
 msgstr "Preguntar antes de vacia_r la papelera"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:47
-#, fuzzy
 #| msgid "Sort files and folders"
-msgid "Allow _permanently deleting files and folders"
-msgstr "Organizar archivos y carpetas"
+msgid "Show action to _permanently delete files and folders"
+msgstr "Mostrar una acción para eliminar archivos y carpetas _permanentemente"
 
 # libnautilus-private/nautilus-global-preferences.c:142
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:48
@@ -5347,85 +5395,72 @@ msgid "List Columns"
 msgstr "Columnas de la lista"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:52
-#| msgid "Search Folder"
 msgid "Search in subfolders:"
 msgstr "Buscar en subcarpetas:"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:53
-#| msgid "On This Computer"
 msgid "_On this computer only"
 msgstr "Sól_o en este equipo"
 
 # src/nautilus-location-bar.c:401
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:54
-#| msgid "_Location"
 msgid "_All locations"
 msgstr "_Todas las ubicaciones"
 
 # libnautilus-private/nautilus-global-preferences.c:592
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:55
-#| msgid "Never"
 msgid "_Never"
 msgstr "_Nunca"
 
 # libnautilus-private/nautilus-global-preferences.c:256
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:56
-#| msgid "Show _thumbnails:"
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
 # libnautilus-private/nautilus-global-preferences.c:256
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:57
-#| msgid "Show _thumbnails:"
 msgid "Show thumbnails:"
 msgstr "Mostrar miniaturas:"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:58
 msgid "_Files on this computer only"
-msgstr ""
+msgstr "Sólo _archivos en este equipo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:198
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:59
-#| msgid "All Files"
 msgid "A_ll files"
 msgstr "To_dos los archivos"
 
 # libnautilus-private/nautilus-global-preferences.c:592
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:60
-#| msgid "Never"
 msgid "N_ever"
 msgstr "N_unca"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:61
-#| msgid "_Only for files smaller than:"
 msgid "Onl_y for files smaller than:"
 msgstr "_Sólo para archivos menores de:"
 
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:62
-#, fuzzy
 #| msgid "File conflict"
 msgid "File count"
-msgstr "Conflicto de archivo"
+msgstr "Total de archivos"
 
 # src/file-manager/dfos-xfer.c:763
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:63
-#| msgid "Count _number of items:"
 msgid "Count number of files in folders:"
 msgstr "Contar el número de archivos en carpetas:"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:64
-#, fuzzy
 #| msgid "Folder is Empty"
 msgid "F_olders in this computer only"
-msgstr "La carpeta está vacía"
+msgstr "Sólo _carpetas en este equipo"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:65
-#| msgid "An older"
 msgid "All folder_s"
 msgstr "Todas las carpeta_s"
 
@@ -5435,10 +5470,9 @@ msgstr "Nun_ca"
 
 # libnautilus-private/nautilus-global-preferences.c:727
 #: ../src/resources/ui/nautilus-preferences-window.ui.h:67
-#, fuzzy
 #| msgid "Search files"
 msgid "Search & Preview"
-msgstr "Buscar archivos"
+msgstr "Buscar y previsualizar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-icon-text-item.c:1487
@@ -5461,19 +5495,17 @@ msgid "Clear the currently selected date"
 msgstr "Limpiar la fecha seleccionada actualmente"
 
 #: ../src/resources/ui/nautilus-search-popover.ui.h:6
-msgid "Around…"
-msgstr "Alrededor de…"
+msgid "Since…"
+msgstr "Desde…"
 
 # src/file-manager/fm-list-view.c:1599
 # src/file-manager/fm-search-list-view.c:158
 #: ../src/resources/ui/nautilus-search-popover.ui.h:7
-#| msgid "Last modified"
 msgid "Last _modified"
 msgstr "Última _modificación"
 
 # src/file-manager/fm-directory-view.c:2154
 #: ../src/resources/ui/nautilus-search-popover.ui.h:8
-#| msgid "Last used"
 msgid "Last _used"
 msgstr "Último _uso"
 
@@ -5613,99 +5645,129 @@ msgstr "Dete_ner"
 msgid "_Files"
 msgstr "_Archivos"
 
-#: ../src/gtk/gtkplacesview.c:883
+#: ../src/gtk/nautilusgtkplacesview.c:880
 msgid "Searching for network locations"
 msgstr "Buscando ubicaciones de red"
 
 # src/file-manager/fm-directory-view.c:1045
-#: ../src/gtk/gtkplacesview.c:890
+#: ../src/gtk/nautilusgtkplacesview.c:887
 msgid "No network locations found"
 msgstr "No se han encontrado ubicaciones de red"
 
-#: ../src/gtk/gtkplacesview.c:1055
+#: ../src/gtk/nautilusgtkplacesview.c:1052
 msgid "Computer"
 msgstr "Equipo"
 
 #. Restore from Cancel to Connect
-#: ../src/gtk/gtkplacesview.c:1182 ../src/gtk/gtkplacesview.ui.h:7
+#: ../src/gtk/nautilusgtkplacesview.c:1179
+#: ../src/gtk/nautilusgtkplacesview.ui.h:7
 msgid "Con_nect"
 msgstr "C_onectar"
 
 #. if it wasn't cancelled show a dialog
-#: ../src/gtk/gtkplacesview.c:1323
+#: ../src/gtk/nautilusgtkplacesview.c:1298
 msgid "Unable to unmount volume"
 msgstr "No se puede desmontar del volumen"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
 #. Allow to cancel the operation
-#: ../src/gtk/gtkplacesview.c:1405
+#: ../src/gtk/nautilusgtkplacesview.c:1380
 msgid "Cance_l"
 msgstr "Cance_lar"
 
 # src/file-manager/fm-directory-view.c:2126
-#: ../src/gtk/gtkplacesview.c:1612
+#: ../src/gtk/nautilusgtkplacesview.c:1587
 msgid "Open in New _Tab"
 msgstr "Abrir en una pe_staña nueva"
 
 # src/file-manager/fm-directory-view.c:2126
-#: ../src/gtk/gtkplacesview.c:1623
+#: ../src/gtk/nautilusgtkplacesview.c:1598
 msgid "Open in New _Window"
 msgstr "Abrir en una _ventana nueva"
 
-#: ../src/gtk/gtkplacesview.c:1822
+#: ../src/gtk/nautilusgtkplacesview.c:1797
 msgid "Unable to get remote server location"
 msgstr "No se pudo obtener la ubicación del servidor remoto"
 
 # libnautilus-private/nautilus-undo-signal-handlers.c:177
-#: ../src/gtk/gtkplacesview.c:1959 ../src/gtk/gtkplacesview.c:1968
+#: ../src/gtk/nautilusgtkplacesview.c:1934
+#: ../src/gtk/nautilusgtkplacesview.c:1943
 msgid "Networks"
 msgstr "Redes"
 
-#: ../src/gtk/gtkplacesview.c:1959 ../src/gtk/gtkplacesview.c:1968
+#: ../src/gtk/nautilusgtkplacesview.c:1934
+#: ../src/gtk/nautilusgtkplacesview.c:1943
 msgid "On This Computer"
 msgstr "En este equipo"
 
-#. Translators: respectively, free and total space of the drive
-#: ../src/gtk/gtkplacesviewrow.c:110
+#. Translators: respectively, free and total space of the drive. The plural form
+#. * should be based on the free space available.
+#. * i.e. 1 GB / 24 GB available.
+#.
+#: ../src/gtk/nautilusgtkplacesviewrow.c:134
 #, c-format
+#| msgid "%s / %s available"
 msgid "%s / %s available"
-msgstr "%s / %s disponible"
+msgid_plural "%s / %s available"
+msgstr[0] "%s / %s disponible"
+msgstr[1] "%s / %s disponibles"
 
-#: ../src/gtk/gtkplacesviewrow.c:449
+#: ../src/gtk/nautilusgtkplacesviewrow.c:472
 msgid "Disconnect"
 msgstr "Desconectar"
 
 # components/html/gnome-dialogs.c:234
-#: ../src/gtk/gtkplacesviewrow.c:449 ../src/gtk/gtkplacesviewrow.ui.h:1
+#: ../src/gtk/nautilusgtkplacesviewrow.c:472
+#: ../src/gtk/nautilusgtkplacesviewrow.ui.h:1
 msgid "Unmount"
 msgstr "Desmontar"
 
 # libnautilus-private/nautilus-global-preferences.c:592
 #. Translators: Server as any successfully connected network address
-#: ../src/gtk/gtkplacesview.ui.h:2
+#: ../src/gtk/nautilusgtkplacesview.ui.h:2
 msgid "No recent servers found"
 msgstr "No se han encontrado servidores recientes"
 
 # libnautilus-private/nautilus-global-preferences.c:592
-#: ../src/gtk/gtkplacesview.ui.h:3
+#: ../src/gtk/nautilusgtkplacesview.ui.h:3
 msgid "Recent Servers"
 msgstr "Servidores recientes"
 
-#: ../src/gtk/gtkplacesview.ui.h:4
+#: ../src/gtk/nautilusgtkplacesview.ui.h:4
 msgid "No results found"
 msgstr "No se encontraron resultados"
 
 # libnautilus-private/nautilus-global-preferences.c:592
-#: ../src/gtk/gtkplacesview.ui.h:6
+#: ../src/gtk/nautilusgtkplacesview.ui.h:6
 msgid "Connect to _Server"
 msgstr "Conectar al _servidor"
 
 # libnautilus-private/nautilus-global-preferences.c:592
-#: ../src/gtk/gtkplacesview.ui.h:8
+#: ../src/gtk/nautilusgtkplacesview.ui.h:8
 msgid "Enter server address…"
 msgstr "Introduzca la dirección del servidor…"
 
+#~ msgid "Unable to rename desktop file"
+#~ msgstr "No se pudo renombrar el archivo del escritorio"
+
+# src/nautilus-window-manage-views.c:173
+#~ msgid "Untitled %s"
+#~ msgstr "Sin título %s"
+
+#~ msgid "--no-desktop and --force-desktop cannot be used together."
+#~ msgstr "--no-desktop y --force-desktop no se pueden usar juntas."
+
+#~ msgid "Never manage the desktop (ignore the GSettings preference)."
+#~ msgstr ""
+#~ "No gestionar nunca el escritorio (ignorar las preferencias de GSettings)."
+
+#~ msgid "Files Preferences"
+#~ msgstr "Preferencias de archivos"
+
+#~ msgid "Around…"
+#~ msgstr "Alrededor de…"
+
 #~| msgid "Enables or disables recursive search in Nautilus."
 #~ msgid "Enables or disables local recursive search in Nautilus."
 #~ msgstr "Activa o desactiva la búsqueda recursiva local en Nautilus."
@@ -5962,10 +6024,6 @@ msgstr "Introduzca la dirección del servidor…"
 #~ msgid "_Server Address"
 #~ msgstr "_Dirección del servidor"
 
-# src/file-manager/fm-properties-window.c:1569
-#~ msgid "Last _Opened"
-#~ msgstr "Abierto por ú_ltima vez"
-
 # libnautilus-private/nautilus-global-preferences.c:727
 #~ msgid "Rename “%s”"
 #~ msgstr "Renombrar «%s»"
author	Daniel Mustieles <daniel.mustieles@gmail.com>	2016-04-27 21:08:40 +0200
committer	Daniel Mustieles <daniel.mustieles@gmail.com>	2016-04-27 21:08:40 +0200
commit	e6a384f5757d8bc503f4138ac80430c4fde860d6 (patch)
tree	6577cb4fc5da745a09d1904f161ae712383e26f1
parent	4df06e7f14ffefedc65bae84fca1cd7f5e945f78 (diff)
download	nautilus-e6a384f5757d8bc503f4138ac80430c4fde860d6.tar.gz