[Commits] [SCM] claws branch, master, updated. 3.13.2-124-g5e10879

[mones at claws-mail.org]

The branch, master has been updated
       via  5e108791506de0e0e1a4393d390f32990b0e4f6a (commit)
       via  eaae8ee958962a2a05464c7d004e2f50eec231a7 (commit)
      from  37c69452bf775368b3a869a3bbc8ea6817441fb0 (commit)

Summary of changes:
 manual/advanced.xml    |   21 +++++++++++----------
 manual/es/advanced.xml |   11 +++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 5e108791506de0e0e1a4393d390f32990b0e4f6a
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Apr 18 14:46:23 2016 +0200

    Synchronize Spanish manual

diff --git a/manual/es/advanced.xml b/manual/es/advanced.xml
index 571ce5b..149bde4 100644
--- a/manual/es/advanced.xml
+++ b/manual/es/advanced.xml
@@ -780,6 +780,17 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
+      </varlistentry>
+       <term><literal>master_passphrase_pbkdf2_rounds</literal></term>
+	<listitem>
+	  <para>
+	Número de veces (o iteraciones) que se deben usar en la función PBKDF2
+	para calcular la derivación de clave de la siguiente contraseña maestra.
+	La derivación almacenada de la contraseña maestra actual no resulta
+	afectada por el cambio de esta opción. El valor por omisión es '50000'.
+	  </para>
+	</listitem>
+      <varlistentry>
 	<term><literal>msgview_date_format</literal></term>
 	<listitem>
 	  <para>

commit eaae8ee958962a2a05464c7d004e2f50eec231a7
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Apr 18 14:45:34 2016 +0200

    Keep current order and add the default value

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 6068b4b..3a8e94e 100644
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -734,6 +734,17 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
+	<term><literal>master_passphrase_pbkdf2_rounds</literal></term>
+	<listitem>
+	  <para>
+	Number of rounds (or iterations) to use in PBKDF2 function when
+	computing next master passphrase key derivation. Currently stored master
+	passphrase KD is not affected by changing this preference.
+	Current value is '50000'.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
 	<term><literal>msgview_date_format</literal></term>
 	<listitem>
 	  <para>
@@ -952,16 +963,6 @@
 	  </para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
-	<term><literal>master_passphrase_pbkdf2_rounds</literal></term>
-	<listitem>
-		<para>
-    Number of rounds (or iterations) to use in PBKDF2 function when
-    computing next master passphrase key derivation. Currently stored master
-    passphrase KD is not affected by changing this preference.
-	  </para>
-	</listitem>
-      </varlistentry>
     </variablelist>
   </section>
   <section id="adv_autofaces">

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail