Merge branch 'feature/upstream' into develop

1 files changed, 75 insertions, 58 deletions

diff --git a/help/es/es.po b/help/es/es.po
index 7132fcd..c192723 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-03-11 08:58+0000\n"
-"PO-Revision-Date: 2019-03-14 15:48+0100\n"
+"POT-Creation-Date: 2019-09-25 11:35+0000\n"
+"PO-Revision-Date: 2019-10-07 10:32+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: es <gnome-es-list@gnome.org>\n"
-"Language: es\n"
+"Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-23 05:24+0000\n"
-"X-Generator: Gtranslator 3.31.90\n"
+"X-Generator: Gtranslator 3.34.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -93,10 +93,6 @@ msgstr "Elija «Todas las páginas del alimentador»."
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:38 C/scanning.page:20
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/scan_toolbar.png' "
-#| "md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
@@ -123,10 +119,6 @@ msgstr ""
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/preferences.png' "
-#| "md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
@@ -158,21 +150,27 @@ msgstr "Recorte"
 
 #. (itstool) path: page/p
 #: C/crop.page:11
+#| msgid ""
+#| "The cropping feature in <app>Simple Scan</app> allows you to use only a "
+#| "part of a scanned image. You can enable crop either before or after "
+#| "scanning a page, and you can always change the dimensions of the crop "
+#| "frame. When crop is enabled, a mask will appear over the current page "
+#| "with the area not being used shown in gray. You can enable crop and "
+#| "choose the desired dimensions via one of the following methods:"
 msgid ""
-"The cropping feature in <app>Simple Scan</app> allows you to use only a part "
-"of a scanned image. You can enable crop either before or after scanning a "
-"page, and you can always change the dimensions of the crop frame. When crop "
-"is enabled, a mask will appear over the current page with the area not being "
-"used shown in gray. You can enable crop and choose the desired dimensions "
-"via one of the following methods:"
-msgstr ""
-"La función de recorte en <app>Simple Scan</app> le permite usar solo una "
-"parte de una imagen escaneada. Puede activar el recorte antes o después de "
-"escanear una página y siempre puede cambiar las dimensiones del marco de "
-"recorte. Cuando el recorte está activado, aparecerá una máscara sobre la "
-"página actual con el área que no se está usando mostrada en gris. Puede "
-"activar el recorte y elegir las dimensiones que quiera mediante uno de los "
-"siguientes métodos:"
+"The cropping feature allows you to use only a part of a scanned image. You "
+"can enable crop either before or after scanning a page, and you can always "
+"change the dimensions of the crop frame. When crop is enabled, a mask will "
+"appear over the current page with the area not being used shown in gray. You "
+"can enable crop and choose the desired dimensions via one of the following "
+"methods:"
+msgstr ""
+"La función de recorte en le permite usar solo una parte de una imagen "
+"escaneada. Puede activar el recorte antes o después de escanear una página y "
+"siempre puede cambiar las dimensiones del marco de recorte. Cuando el "
+"recorte está activado, aparecerá una máscara sobre la página actual con el "
+"área que no se está usando mostrada en gris. Puede activar el recorte y "
+"elegir las dimensiones que quiera mediante uno de los siguientes métodos:"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
@@ -390,14 +388,22 @@ msgstr "Ali Shtarbanov"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/index.page:17
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
 msgctxt "_"
-msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgid "external ref='figures/icon.svg' md5='e0fbd536ef08711877b65373c0e0173a'"
+msgstr "external ref='figures/icon.svg' md5='e0fbd536ef08711877b65373c0e0173a'"
 
 #. (itstool) path: page/title
 #: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr "<media type=\"image\" src=\"figures/icon.png\"/> Manual de Simple Scan"
+#| msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgid ""
+"<media type=\"image\" src=\"figures/icon.svg\" height=\"32px\"/>Document "
+"Scanner Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Manual de escaneador de "
+"documentos"
 
 #. (itstool) path: section/title
 #: C/index.page:20
@@ -442,24 +448,26 @@ msgstr "Imprimir"
 
 #. (itstool) path: page/p
 #: C/print.page:11
+#| msgid ""
+#| "<app>Simple Scan</app> allows you print a scanned document directly from "
+#| "the its interface, without having to save the document first. This "
+#| "feature makes <app>Simple Scan</app> a very convenient tool for making "
+#| "copies of documents or photos."
 msgid ""
-"<app>Simple Scan</app> allows you print a scanned document directly from the "
-"its interface, without having to save the document first. This feature makes "
-"<app>Simple Scan</app> a very convenient tool for making copies of documents "
-"or photos."
+"You are able to print a scanned document directly without having to save the "
+"document first. This is convenient for making copies of documents or photos."
 msgstr ""
-"<app>Simple Scan</app> le permite imprimir un documento escaneado "
-"directamente desde su interfaz, sin tener que guardar primero el documento. "
-"Esta característica hace que <app>Simple Scan</app> sea una herramienta muy "
-"conveniente para hacer copias de documentos o fotos."
+"Puede imprimir un documento escaneado directamente desde su interfaz, sin "
+"tener que guardar primero el documento. Estao es muy útil para hacer copias "
+"de documentos o fotos."
 
 #. (itstool) path: steps/title
-#: C/print.page:17
+#: C/print.page:16
 msgid "To Print a Document"
 msgstr "Para imprimir un documento"
 
 #. (itstool) path: item/p
-#: C/print.page:19
+#: C/print.page:18
 msgid ""
 "Go to the <guiseq><gui>Document</gui><gui>Print</gui> </guiseq> menu or use "
 "the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>. This "
@@ -470,7 +478,7 @@ msgstr ""
 "abrirá el cuadro de diálogo «Imprimir»."
 
 #. (itstool) path: item/p
-#: C/print.page:25
+#: C/print.page:24
 msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
@@ -537,14 +545,16 @@ msgstr "Rotar una página"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
+#| msgid ""
+#| "In <app>Simple Scan</app>, you can change the rotation of a page either "
+#| "before or after scanning the page. Currently, there are four ways to "
+#| "rotate a page:"
 msgid ""
-"In <app>Simple Scan</app>, you can change the rotation of a page either "
-"before or after scanning the page. Currently, there are four ways to rotate "
-"a page:"
+"You can change the rotation of a page either before or after scanning the "
+"page. Currently, there are four ways to rotate a page:"
 msgstr ""
-"En <app>Simple Scan</app>, puede cambiar la rotación de una página ya sea "
-"antes o después escanear la página. Actualmente, hay cuatro maneras de rotar "
-"la página:"
+"Puede cambiar la rotación de una página ya sea antes o después escanear la "
+"página. Actualmente, hay cuatro maneras de rotar la página:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
@@ -786,16 +796,22 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
+#| msgid ""
+#| "Your local scanners are automatically detected each time you start "
+#| "<app>Simple Scan</app> and each time you plug in a USB scanner. If you "
+#| "connect a network scanner while <app>Simple Scan</app> is running, you "
+#| "will need to restart <app>Simple Scan</app> for the scanner to be "
+#| "detected."
 msgid ""
-"Your local scanners are automatically detected each time you start "
-"<app>Simple Scan</app> and each time you plug in a USB scanner. If you "
-"connect a network scanner while <app>Simple Scan</app> is running, you will "
-"need to restart <app>Simple Scan</app> for the scanner to be detected."
+"Local scanners are automatically detected each time <app>Document Scanner</"
+"app> starts and each time you plug in a USB scanner. If you connect a "
+"network scanner you will need to restart <app>Document Scanner</app> for the "
+"scanner to be detected."
 msgstr ""
-"Sus escáneres locales se detectan automáticamente cada vez que inicia "
-"<app>Simple Scan</app> y cada vez que conecta un escáner USB. Si conecta un "
-"escáner de red mientras se ejecuta <app>Simple Scan</app>, deberá reiniciar "
-"<app>Simple Scan</app> para que se detecte el escáner."
+"Sus escáneres locales se detectan automáticamente cada vez que inicia el "
+"<app>Escaneador de documentos</app> y cada vez que conecta un escáner USB. "
+"Si conecta un escáner de red deberá reiniciar el <app>Escaneador de "
+"documentos</app> para que se detecte el escáner."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -820,8 +836,9 @@ msgstr "Conecte el escáner a su equipo y enciéndalo."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
-msgid "Open <app>Simple Scan</app>."
-msgstr "Abra <app>Simple Scan</app>."
+#| msgid "Open <app>Simple Scan</app>."
+msgid "Open <app>Document Scanner</app>."
+msgstr "Abra <app>Escaneador de documentos</app>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:18