diff --git a/po/es.po b/po/es.po
index dcc24aad378e1b543f6cda7717904108373bb282..ecd6839f422b8eb51a1f211ce58b553fffc6179c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,6 +12,7 @@
 # Edwin Pujols <edwinpm5@gmail.com>, 2014
 # Francisco F. Serrador <serrador@tecknolabs.com>, 2018
 # Jaime Marquínez Ferrándiz, 2018
+# Luis Mendoza <darcn181@gmail.com>, 2018
 # Miguel Angel Ruiz Manzano <debianized@gmail.com>, 2006
 # Pablo Hernández-M. Saiz <homeless3d@gmail.com>, 2005
 # Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] <prflr88@gmail.com>, 2017-2018
@@ -21,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-24 06:30+0100\n"
-"PO-Revision-Date: 2018-03-30 08:37+0000\n"
-"Last-Translator: Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] <prflr88@gmail.com>\n"
+"POT-Creation-Date: 2018-05-06 00:30+0200\n"
+"PO-Revision-Date: 2018-05-18 17:21+0000\n"
+"Last-Translator: Luis Mendoza <darcn181@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/xfce/thunar/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -240,8 +241,8 @@ msgstr[1] "¿Está seguro de que quiere eliminar\npermanentemente los %u archivo
 #: ../thunar/thunar-application.c:2099 ../thunar/thunar-application.c:2278
 #: ../thunar/thunar-chooser-dialog.c:288 ../thunar/thunar-chooser-dialog.c:705
 #: ../thunar/thunar-chooser-dialog.c:753 ../thunar/thunar-create-dialog.c:141
-#: ../thunar/thunar-dialogs.c:98 ../thunar/thunar-dialogs.c:479
-#: ../thunar/thunar-dialogs.c:550 ../thunar/thunar-dialogs.c:805
+#: ../thunar/thunar-dialogs.c:98 ../thunar/thunar-dialogs.c:481
+#: ../thunar/thunar-dialogs.c:552 ../thunar/thunar-dialogs.c:807
 #: ../thunar/thunar-dnd.c:165 ../thunar/thunar-launcher.c:728
 #: ../thunar/thunar-permissions-chooser.c:523
 #: ../thunar/thunar-permissions-chooser.c:1136
@@ -513,7 +514,7 @@ msgstr "No hay nada que pegar en el portapapeles"
 
 #. setup the dialog
 #. add a regular close button, the header bar already provides one
-#: ../thunar/thunar-column-editor.c:118 ../thunar/thunar-dialogs.c:750
+#: ../thunar/thunar-column-editor.c:118 ../thunar/thunar-dialogs.c:752
 #: ../thunar/thunar-preferences-dialog.c:229
 #: ../thunar/thunar-properties-dialog.c:254
 #: ../thunar/thunar-renamer-dialog.c:355
@@ -662,11 +663,11 @@ msgstr "Configurar _columnas…"
 msgid "Configure the columns in the detailed list view"
 msgstr "Configura las columnas de la vista detallada de listas"
 
-#: ../thunar/thunar-details-view.c:397
+#: ../thunar/thunar-details-view.c:398
 msgid "Detailed directory listing"
 msgstr "Listado detallado de la carpeta"
 
-#: ../thunar/thunar-details-view.c:398
+#: ../thunar/thunar-details-view.c:399
 msgid "Details view"
 msgstr "Vista detallada"
 
@@ -680,123 +681,123 @@ msgstr "Renombre «%s»"
 msgid "_Rename"
 msgstr "Cambia_r el nombre"
 
-#: ../thunar/thunar-dialogs.c:271
+#: ../thunar/thunar-dialogs.c:273
 msgid "translator-credits"
 msgstr "Elega <elega@elega.com.ar>,\nPablo Hernández-M. Saiz <homeless3d@gmail.com>,\nMiguel Ángel Ruiz Manzano <debianized@gmail.com>,\nDaniel «DaniFP» Fuertes Pérez <danifp25@yahoo.es>,\nAbel Martín <abel.martin.ruiz@gmail.com>,\nPablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>,\nAdolfo Jayme Barrientos <fitojb@ubuntu.com>"
 
-#: ../thunar/thunar-dialogs.c:436 ../thunar/thunar-permissions-chooser.c:525
+#: ../thunar/thunar-dialogs.c:438 ../thunar/thunar-permissions-chooser.c:525
 msgid "_Yes"
 msgstr "_Sí"
 
-#: ../thunar/thunar-dialogs.c:440
+#: ../thunar/thunar-dialogs.c:442
 msgid "Yes to _all"
 msgstr "Sí _a todo"
 
-#: ../thunar/thunar-dialogs.c:444 ../thunar/thunar-permissions-chooser.c:524
+#: ../thunar/thunar-dialogs.c:446 ../thunar/thunar-permissions-chooser.c:524
 msgid "_No"
 msgstr "_No"
 
-#: ../thunar/thunar-dialogs.c:448
+#: ../thunar/thunar-dialogs.c:450
 msgid "N_o to all"
 msgstr "N_o a todo"
 
-#: ../thunar/thunar-dialogs.c:452
+#: ../thunar/thunar-dialogs.c:454
 msgid "_Retry"
 msgstr "_Reintentar"
 
-#: ../thunar/thunar-dialogs.c:456
+#: ../thunar/thunar-dialogs.c:458
 msgid "Copy _Anyway"
 msgstr "Copiar de todos _modos"
 
 #. setup the confirmation dialog
-#: ../thunar/thunar-dialogs.c:546
+#: ../thunar/thunar-dialogs.c:548
 msgid "Confirm to replace files"
 msgstr "Confirmar para remplazar archivos"
 
-#: ../thunar/thunar-dialogs.c:551
+#: ../thunar/thunar-dialogs.c:553
 msgid "S_kip All"
 msgstr "_Omitir todo"
 
-#: ../thunar/thunar-dialogs.c:552
+#: ../thunar/thunar-dialogs.c:554
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../thunar/thunar-dialogs.c:553
+#: ../thunar/thunar-dialogs.c:555
 msgid "Replace _All"
 msgstr "Remplazar _todo"
 
-#: ../thunar/thunar-dialogs.c:554
+#: ../thunar/thunar-dialogs.c:556
 msgid "_Replace"
 msgstr "_Remplazar"
 
-#: ../thunar/thunar-dialogs.c:589
+#: ../thunar/thunar-dialogs.c:591
 #, c-format
 msgid "This folder already contains a symbolic link \"%s\"."
 msgstr "Esta carpeta ya contiene un enlace simbólico «%s»."
 
-#: ../thunar/thunar-dialogs.c:594
+#: ../thunar/thunar-dialogs.c:596
 #, c-format
 msgid "This folder already contains a folder \"%s\"."
 msgstr "Esta carpeta ya contiene una carpeta «%s»."
 
-#: ../thunar/thunar-dialogs.c:599
+#: ../thunar/thunar-dialogs.c:601
 #, c-format
 msgid "This folder already contains a file \"%s\"."
 msgstr "Esta carpeta ya contiene un fichero «%s»."
 
-#: ../thunar/thunar-dialogs.c:612
+#: ../thunar/thunar-dialogs.c:614
 #, c-format
 msgid "ReplaceDialogPart1|Do you want to replace the link"
 msgstr "¿Quiere remplazar el enlace existente"
 
-#: ../thunar/thunar-dialogs.c:614
+#: ../thunar/thunar-dialogs.c:616
 #, c-format
 msgid "ReplaceDialogPart1|Do you want to replace the existing folder"
 msgstr "¿Quiere remplazar la carpeta existente"
 
-#: ../thunar/thunar-dialogs.c:616
+#: ../thunar/thunar-dialogs.c:618
 #, c-format
 msgid "ReplaceDialogPart1|Do you want to replace the existing file"
 msgstr "¿Quiere remplazar el fichero existente"
 
 #. Fourth box (size, volume, free space)
-#: ../thunar/thunar-dialogs.c:637 ../thunar/thunar-dialogs.c:673
+#: ../thunar/thunar-dialogs.c:639 ../thunar/thunar-dialogs.c:675
 #: ../thunar/thunar-properties-dialog.c:490
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../thunar/thunar-dialogs.c:637 ../thunar/thunar-dialogs.c:673
+#: ../thunar/thunar-dialogs.c:639 ../thunar/thunar-dialogs.c:675
 #: ../thunar/thunar-properties-dialog.c:449
 msgid "Modified:"
 msgstr "Modificado el:"
 
-#: ../thunar/thunar-dialogs.c:648
+#: ../thunar/thunar-dialogs.c:650
 #, c-format
 msgid "ReplaceDialogPart2|with the following link?"
 msgstr "por el siguiente enlace?"
 
-#: ../thunar/thunar-dialogs.c:650
+#: ../thunar/thunar-dialogs.c:652
 #, c-format
 msgid "ReplaceDialogPart2|with the following folder?"
 msgstr "por la siguiente carpeta?"
 
-#: ../thunar/thunar-dialogs.c:652
+#: ../thunar/thunar-dialogs.c:654
 #, c-format
 msgid "ReplaceDialogPart2|with the following file?"
 msgstr "por el siguiente fichero?"
 
-#: ../thunar/thunar-dialogs.c:785
+#: ../thunar/thunar-dialogs.c:787
 #, c-format
 msgid ""
 "The desktop file \"%s\" is in an insecure location and not marked as "
 "executable. If you do not trust this program, click Cancel."
 msgstr "El archivo .desktop «%s» está en una ubicación insegura y no está marcado como ejecutable. Si no confía en este programa, pulse Cancelar."
 
-#: ../thunar/thunar-dialogs.c:802
+#: ../thunar/thunar-dialogs.c:804
 msgid "_Launch Anyway"
 msgstr "_Lanzar de todas maneras"
 
-#: ../thunar/thunar-dialogs.c:804
+#: ../thunar/thunar-dialogs.c:806
 msgid "Mark _Executable"
 msgstr "Marcar como _ejecutable"
 
@@ -1830,8 +1831,8 @@ msgid ""
 msgstr "Al cambiar los permisos de una carpeta, también puede \naplicar los cambios a lo que haya dentro. Seleccione \ndebajo el comportamiento predeterminado:"
 
 #: ../thunar/thunar-preferences-dialog.c:626
-msgid "Ask everytime"
-msgstr "Preguntar siempre"
+msgid "Ask every time"
+msgstr "Preguntar todo el tiempo"
 
 #: ../thunar/thunar-preferences-dialog.c:627
 msgid "Apply to Folder Only"
@@ -1852,9 +1853,9 @@ msgstr "Activar gestión de _volúmenes"
 
 #: ../thunar/thunar-preferences-dialog.c:665
 msgid ""
-"<a href=\"volman-config:\">Configure</a> the management of removable drives\n"
-"and media (e.g., how cameras should be handled)."
-msgstr "<a href=\"volman-config:\">Configure</a> la gestión de dispositivos extraíbles\ny medios (por ej., cómo deben manejarse las cámaras)."
+"<a href=\"volman-config:\">Configure</a> the management of removable drives,\n"
+"devices and media."
+msgstr "<a href=\"volman-config:\">Configura</a> el manejo de unidades extraíbles,\ndispositivos y multimedia."
 
 #. tell the user that we failed to come up with the thunar-volman
 #. configuration dialog