Merge branch '7.6RC'7.6

2 files changed, 5 insertions, 5 deletions

diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index ce0a26aaa..17d4477c5 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -7256,7 +7256,7 @@ msgstr "Configuración del canal"
 
 #: ../../Zotlabs/Widget/Settings_menu.php:49
 msgid "Privacy settings"
-msgstr "Ajustes de peivacidad"
+msgstr "Ajustes de privacidad"
 
 #: ../../Zotlabs/Widget/Settings_menu.php:56
 msgid "Display settings"
@@ -11807,7 +11807,7 @@ msgstr "Aprobar contacto"
 #: ../../Zotlabs/Module/Contactedit.php:431
 #: ../../Zotlabs/Module/Connedit.php:717
 msgid "Their"
-msgstr "Su/Sus"
+msgstr "Su"
 
 #: ../../Zotlabs/Module/Contactedit.php:432
 #: ../../Zotlabs/Module/Connedit.php:718
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 1e4b43055..47a18171d 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_es_es")) {
 function string_plural_select_es_es($n){
-	return ($n != 1);
+	return ($n != 1 ? 1 : 0);
 }}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)";
@@ -1619,7 +1619,7 @@ App::$strings["Remove term"] = "Eliminar término";
 App::$strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
 App::$strings["Account settings"] = "Configuración de la cuenta";
 App::$strings["Channel settings"] = "Configuración del canal";
-App::$strings["Privacy settings"] = "Ajustes de peivacidad";
+App::$strings["Privacy settings"] = "Ajustes de privacidad";
 App::$strings["Display settings"] = "Ajustes de visualización";
 App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
 App::$strings["Overview"] = "Resumen";
@@ -2653,7 +2653,7 @@ App::$strings["Custom Filter"] = "Filtro personalizado";
 App::$strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
 App::$strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
 App::$strings["Approve contact"] = "Aprobar contacto";
-App::$strings["Their"] = "Su/Sus";
+App::$strings["Their"] = "Su";
 App::$strings["My"] = "Mi";
 App::$strings["Roles"] = "Roles";
 App::$strings["Compare permissions"] = "Comparar permisos";