diff options
| -rw-r--r-- | include/import.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rwxr-xr-x | util/update_autoloader | 2 | ||||
| -rwxr-xr-x | util/zotsh/zotsh.py | 4 | ||||
| -rw-r--r-- | view/css/mod_wiki.css | 8 | ||||
| -rw-r--r-- | view/es-es/hmessages.po | 249 | ||||
| -rw-r--r-- | view/es-es/hstrings.php | 2 |
7 files changed, 139 insertions, 129 deletions
diff --git a/include/import.php b/include/import.php index 3b5ddd1f1..3f4d84765 100644 --- a/include/import.php +++ b/include/import.php @@ -156,6 +156,7 @@ function import_profiles($channel, $profiles) { unset($profile['id']); $profile['aid'] = get_account_id(); $profile['uid'] = $channel['channel_id']; + unset($profile['profile_vcard']); convert_oldfields($profile,'name','fullname'); convert_oldfields($profile,'with','partner'); diff --git a/include/zot.php b/include/zot.php index 748fe7b99..31debbe9d 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3841,7 +3841,7 @@ function zotinfo($arr) { if($role === 'forum' || $role === 'repository') { $public_forum = true; } - else { + elseif($ztarget_hash) { // check if it has characteristics of a public forum based on custom permissions. $m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']); if($m) { diff --git a/util/update_autoloader b/util/update_autoloader new file mode 100755 index 000000000..1a6e8eb8d --- /dev/null +++ b/util/update_autoloader @@ -0,0 +1,2 @@ +#!/bin/bash -f +composer install --optimize-autoloader --no-dev diff --git a/util/zotsh/zotsh.py b/util/zotsh/zotsh.py index 36506b39d..d5e1aa527 100755 --- a/util/zotsh/zotsh.py +++ b/util/zotsh/zotsh.py @@ -55,7 +55,7 @@ class ZotSH(object): @session.setter
def session(self, session):
self._session = session
- self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
+ self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL)
@property
def PS1(self):
@@ -205,7 +205,7 @@ class ZotSH(object): print _fmt('d', 0, "../")
for f in r:
- name = f.name.replace("/cloud"+self.davclient.cwd,"")
+ name = f.name.replace("/dav"+self.davclient.cwd,"")
type = "-"
if name.endswith("/"):
type = "d"
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index b44ec4fd8..b77645d4f 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -38,14 +38,14 @@ padding: 7px 3px 7px 10px; } -#wikis-index th:nth-child(3), -#wikis-index td:nth-child(3){ +#wikis-index th:nth-child(4), +#wikis-index td:nth-child(4){ padding: 7px 10px 7px 7px; white-space: nowrap; } -#wikis-index th:nth-child(4), -#wikis-index td:nth-child(4){ +#wikis-index th:nth-child(5), +#wikis-index td:nth-child(5){ padding: 7px 10px 7px 7px; } diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index f67a524d5..a2341b272 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -3020,13 +3020,15 @@ msgstr "Un sitio por línea. El contenido incorporado se filtra de forma predete msgid "Block embedded HTML from these domains" msgstr "Bloquear contenido con HTML incorporado desde estos dominios" -#: ../../Zotlabs/Module/Lockview.php:75 -msgid "Remote privacy information not available." -msgstr "La información privada remota no está disponible." +#: ../../Zotlabs/Module/Events.php:475 +msgid "Edit Location" +msgstr "Modificar la dirección" -#: ../../Zotlabs/Module/Lockview.php:96 -msgid "Visible to:" -msgstr "Visible para:" +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1094 +#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740 +#: ../../include/page_widgets.php:43 ../../include/conversation.php:1347 +msgid "Preview" +msgstr "Previsualizar" #: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 #: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183 @@ -4847,13 +4849,21 @@ msgstr "Por favor ajuste el recorte de la imagen para una visión óptima." msgid "Done Editing" msgstr "Edición completada" -#: ../../Zotlabs/Module/Chatsvc.php:131 -msgid "Away" -msgstr "Ausente" +#: ../../Zotlabs/Module/Profile.php:91 +msgid "vcard" +msgstr "vcard" -#: ../../Zotlabs/Module/Chatsvc.php:136 -msgid "Online" -msgstr "Conectado/a" +#: ../../Zotlabs/Module/Oexchange.php:27 +msgid "Unable to find your hub." +msgstr "No se puede encontrar su servidor." + +#: ../../Zotlabs/Module/Oexchange.php:41 +msgid "Post successful." +msgstr "Enviado con éxito." + +#: ../../Zotlabs/Module/Viewsrc.php:46 +msgid "Source of Item" +msgstr "Origen del elemento" #: ../../Zotlabs/Module/Item.php:185 msgid "Unable to locate original post." @@ -11647,9 +11657,9 @@ msgstr "desconocido" msgid "remove category" msgstr "eliminar el tema" -#: ../../include/text.php:1519 -msgid "remove from file" -msgstr "eliminar del fichero" +#: ../../include/group.php:334 +msgid "Channels not in any privacy group" +msgstr "Sin canales en ningún grupo" #: ../../include/text.php:1781 ../../include/language.php:367 msgid "default" @@ -12099,28 +12109,25 @@ msgstr "[sin asunto]" msgid "Stored post could not be verified." msgstr "No se han podido verificar las publicaciones guardadas." -#: ../../include/activities.php:41 -msgid " and " -msgstr " y " +#: ../../include/text.php:1106 +msgid "slap" +msgstr "una bofetada " -#: ../../include/activities.php:49 -msgid "public profile" -msgstr "el perfil público" +#: ../../include/text.php:1106 +msgid "slapped" +msgstr "ha abofeteado a " -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s ha cambiado %2$s a “%3$s”" +#: ../../include/text.php:1107 +msgid "finger" +msgstr "un \"finger\" " -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "Visitar %2$s de %1$s" +#: ../../include/text.php:1107 +msgid "fingered" +msgstr "envió un \"finger\" a" -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s ha actualizado %2$s, cambiando %3$s." +#: ../../include/text.php:1108 +msgid "rebuff" +msgstr "un reproche" #: ../../include/attach.php:250 ../../include/attach.php:339 msgid "Item was not found." @@ -12263,34 +12270,33 @@ msgctxt "edit_activity" msgid "Comment" msgstr "Comentar" -#: ../../include/channel.php:33 -msgid "Unable to obtain identity information from database" -msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" +#: ../../include/text.php:1128 +msgid "interested" +msgstr "interesado/a" -#: ../../include/channel.php:67 -msgid "Empty name" -msgstr "Nombre vacío" +#: ../../include/text.php:1129 +msgid "bitter" +msgstr "amargado/a" -#: ../../include/channel.php:70 -msgid "Name too long" -msgstr "Nombre demasiado largo" +#: ../../include/text.php:1130 +msgid "cheerful" +msgstr "alegre" -#: ../../include/channel.php:181 -msgid "No account identifier" -msgstr "Ningún identificador de la cuenta" +#: ../../include/text.php:1131 +msgid "alive" +msgstr "animado/a" -#: ../../include/channel.php:193 -msgid "Nickname is required." -msgstr "Se requiere un sobrenombre (alias)." +#: ../../include/text.php:1132 +msgid "annoyed" +msgstr "molesto/a" -#: ../../include/channel.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "Sobrenombre en uso. Por favor, elija otro." +#: ../../include/text.php:1133 +msgid "anxious" +msgstr "ansioso/a" -#: ../../include/channel.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio." +#: ../../include/text.php:1134 +msgid "cranky" +msgstr "de mal humor" #: ../../include/channel.php:270 msgid "Unable to retrieve created identity" @@ -12320,94 +12326,93 @@ msgstr "Página personal:" msgid "Online Now" msgstr "Ahora en línea" -#: ../../include/channel.php:1257 -msgid "Like this channel" -msgstr "Me gusta este canal" +#: ../../include/text.php:1408 ../../include/text.php:1412 +msgid "Unknown Attachment" +msgstr "Adjunto no reconocido" -#: ../../include/channel.php:1281 -msgid "j F, Y" -msgstr "j F Y" +#: ../../include/text.php:1414 +msgid "unknown" +msgstr "desconocido" -#: ../../include/channel.php:1282 -msgid "j F" -msgstr "j F" +#: ../../include/text.php:1450 +msgid "remove category" +msgstr "eliminar el tema" -#: ../../include/channel.php:1289 -msgid "Birthday:" -msgstr "Cumpleaños:" +#: ../../include/text.php:1527 +msgid "remove from file" +msgstr "eliminar del fichero" -#: ../../include/channel.php:1302 -#, php-format -msgid "for %1$d %2$s" -msgstr "por %1$d %2$s" +#: ../../include/text.php:1796 +msgid "Page layout" +msgstr "Plantilla de la página" -#: ../../include/channel.php:1305 -msgid "Sexual Preference:" -msgstr "Orientación sexual:" +#: ../../include/text.php:1796 +msgid "You can create your own with the layouts tool" +msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas" -#: ../../include/channel.php:1311 -msgid "Tags:" -msgstr "Etiquetas:" +#: ../../include/text.php:1838 +msgid "Page content type" +msgstr "Tipo de contenido de la página" -#: ../../include/channel.php:1313 -msgid "Political Views:" -msgstr "Posición política:" +#: ../../include/text.php:1971 +msgid "activity" +msgstr "la actividad" -#: ../../include/channel.php:1315 -msgid "Religion:" -msgstr "Religión:" +#: ../../include/text.php:2285 +msgid "Design Tools" +msgstr "Herramientas de diseño web" -#: ../../include/channel.php:1319 -msgid "Hobbies/Interests:" -msgstr "Aficciones o intereses:" +#: ../../include/text.php:2291 +msgid "Pages" +msgstr "Páginas" -#: ../../include/channel.php:1321 -msgid "Likes:" -msgstr "Me gusta:" +#: ../../include/text.php:2313 +msgid "Import website..." +msgstr "Importar un sitio web..." -#: ../../include/channel.php:1323 -msgid "Dislikes:" -msgstr "No me gusta:" +#: ../../include/text.php:2314 +msgid "Select folder to import" +msgstr "Seleccionar la carpeta que se va a importar" -#: ../../include/channel.php:1325 -msgid "Contact information and Social Networks:" -msgstr "Información de contacto y redes sociales:" +#: ../../include/text.php:2315 +msgid "Import from a zipped folder:" +msgstr "Importar desde una carpeta comprimida: " -#: ../../include/channel.php:1327 -msgid "My other channels:" -msgstr "Mis otros canales:" +#: ../../include/text.php:2316 +msgid "Import from cloud files:" +msgstr "Importar desde los ficheros en la nube: " -#: ../../include/channel.php:1329 -msgid "Musical interests:" -msgstr "Preferencias musicales:" +#: ../../include/text.php:2317 +msgid "/cloud/channel/path/to/folder" +msgstr "/cloud/canal/ruta/a la/carpeta" -#: ../../include/channel.php:1331 -msgid "Books, literature:" -msgstr "Libros, literatura:" +#: ../../include/text.php:2318 +msgid "Enter path to website files" +msgstr "Ruta a los ficheros del sitio web" -#: ../../include/channel.php:1333 -msgid "Television:" -msgstr "Televisión:" +#: ../../include/text.php:2319 +msgid "Select folder" +msgstr "Seleccionar la carpeta" -#: ../../include/channel.php:1335 -msgid "Film/dance/culture/entertainment:" -msgstr "Cine, danza, cultura, entretenimiento:" +#: ../../include/text.php:2320 +msgid "Export website..." +msgstr "Exportar un sitio web..." -#: ../../include/channel.php:1337 -msgid "Love/Romance:" -msgstr "Vida sentimental o amorosa:" +#: ../../include/text.php:2321 +msgid "Export to a zip file" +msgstr "Exportar a un fichero comprimido .zip" -#: ../../include/channel.php:1339 -msgid "Work/employment:" -msgstr "Trabajo:" +#: ../../include/text.php:2322 +msgid "website.zip" +msgstr "sitio_web.zip" -#: ../../include/channel.php:1341 -msgid "School/education:" -msgstr "Estudios:" +#: ../../include/text.php:2323 +msgid "Enter a name for the zip file." +msgstr "Escriba un nombre para el fichero zip." -#: ../../include/channel.php:1364 -msgid "Like this thing" -msgstr "Me gusta esto" +#: ../../include/text.php:2324 +msgid "Export to cloud files" +msgstr "Exportar a la nube de ficheros" #: ../../include/channel.php:2139 #, php-format diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index ae1164cdb..59363f6ed 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -472,7 +472,9 @@ App::$strings["%s - (Incompatible)"] = "%s - (Incompatible)"; App::$strings["mobile"] = "móvil"; App::$strings["experimental"] = "experimental"; App::$strings["unsupported"] = "no soportado"; +App::$strings["No"] = "No"; App::$strings["Yes - with approval"] = "Sí - con aprobación"; +App::$strings["Yes"] = "Sí"; App::$strings["My site is not a public server"] = "Mi sitio no es un servidor público"; App::$strings["My site has paid access only"] = "Mi sitio es un servicio de pago"; App::$strings["My site has free access only"] = "Mi sitio es un servicio gratuito"; |