aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/es-es/hmessages.po44
-rw-r--r--view/es-es/hstrings.php42
-rw-r--r--view/js/main.js41
-rw-r--r--view/ru/hmessages.po457
-rw-r--r--view/ru/hstrings.php57
-rw-r--r--view/theme/redbasic/schema/Focus-Light.css1
-rw-r--r--view/theme/redbasic/schema/dark.css3
-rwxr-xr-xview/tpl/js_strings.tpl2
-rw-r--r--view/tpl/wiki.tpl4
-rw-r--r--view/tpl/wiki_page_list.tpl2
-rw-r--r--view/tpl/wikilist.tpl2
11 files changed, 374 insertions, 281 deletions
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 26045e6b5..54a1f3bed 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: hubzilla\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-06 17:07+0200\n"
-"PO-Revision-Date: 2018-10-08 17:43+0000\n"
+"PO-Revision-Date: 2018-10-11 10:13+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n"
"Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n"
"MIME-Version: 1.0\n"
@@ -910,7 +910,7 @@ msgstr "Se ha guardado la categoría del permiso."
#: ../../Zotlabs/Module/Permcats.php:62
msgid "Permission Categories App"
-msgstr "App de categorías de permisos"
+msgstr "App Categorías de permisos"
#: ../../Zotlabs/Module/Permcats.php:63
msgid "Create custom connection permission limits"
@@ -998,7 +998,7 @@ msgstr "Cambiar el idioma de la interfaz de usuario"
#: ../../Zotlabs/Module/Uexport.php:61
msgid "Channel Export App"
-msgstr "App de exportación de canales"
+msgstr "App Exportación de canales"
#: ../../Zotlabs/Module/Uexport.php:62
msgid "Export your channel"
@@ -2331,7 +2331,7 @@ msgstr "Continuar"
#: ../../Zotlabs/Module/Connect.php:104
msgid "Premium Channel App"
-msgstr "App canal premium"
+msgstr "App Canal premium"
#: ../../Zotlabs/Module/Connect.php:105
msgid ""
@@ -4037,7 +4037,7 @@ msgstr "Ajustes guardados. Recargue la página, por favor."
#: ../../Zotlabs/Module/Settings/Conversation.php:46
msgid "Conversation Settings"
-msgstr "Ajustes de Conversation"
+msgstr "Ajustes de conversación"
#: ../../Zotlabs/Module/Settings/Connections.php:39
msgid "Connections Settings"
@@ -4307,7 +4307,7 @@ msgstr "Token salvado."
#: ../../Zotlabs/Module/Tokens.php:99
msgid "Guest Access App"
-msgstr "App de acceso para invitados"
+msgstr "App Acceso para invitados"
#: ../../Zotlabs/Module/Tokens.php:100
msgid "Create access tokens so that non-members can access private content"
@@ -4647,7 +4647,7 @@ msgstr "Elemento no disponible"
#: ../../Zotlabs/Module/Randprof.php:29
msgid "Random Channel App"
-msgstr "App canal aleatorio"
+msgstr "App Canal aleatorio"
#: ../../Zotlabs/Module/Randprof.php:30
msgid "Visit a random channel in the $Projectname network"
@@ -4685,7 +4685,7 @@ msgstr "%1$s está %2$s"
#: ../../Zotlabs/Module/Mood.php:132
msgid "Mood App"
-msgstr "App estados de ánimo"
+msgstr "App Estados de ánimo"
#: ../../Zotlabs/Module/Mood.php:133 ../../Zotlabs/Module/Mood.php:153
msgid "Set your current mood and tell your friends"
@@ -4864,7 +4864,7 @@ msgstr "Marcador añadido"
#: ../../Zotlabs/Module/Bookmarks.php:78
msgid "Bookmarks App"
-msgstr "App marcadores"
+msgstr "App Marcadores"
#: ../../Zotlabs/Module/Bookmarks.php:79
msgid "Bookmark links from posts and manage them"
@@ -5155,7 +5155,7 @@ msgstr "Perfil no disponible"
#: ../../Zotlabs/Module/Wiki.php:52
msgid "Wiki App"
-msgstr "App wiki"
+msgstr "App Wiki"
#: ../../Zotlabs/Module/Wiki.php:53
msgid "Provide a wiki for your channel"
@@ -5401,7 +5401,7 @@ msgstr "Plantilla actualizada."
#: ../../Zotlabs/Module/Pdledit.php:42
msgid "PDL Editor App"
-msgstr "App editor PDL"
+msgstr "App Editor PDL"
#: ../../Zotlabs/Module/Pdledit.php:43
msgid "Provides the ability to edit system page layouts"
@@ -5441,7 +5441,7 @@ msgstr "Diseño del sistema"
#: ../../Zotlabs/Module/Poke.php:165
msgid "Poke App"
-msgstr "App toques"
+msgstr "App Toques"
#: ../../Zotlabs/Module/Poke.php:166
msgid "Poke somebody in your addressbook"
@@ -5995,7 +5995,7 @@ msgstr "Detalles"
#: ../../Zotlabs/Module/Chat.php:102
msgid "Chatrooms App"
-msgstr "App salas de chat"
+msgstr "App Salas de chat"
#: ../../Zotlabs/Module/Chat.php:103
msgid "Access Controlled Chatrooms"
@@ -6188,7 +6188,7 @@ msgstr "Descargar el fichero PDL"
#: ../../Zotlabs/Module/Notes.php:55
msgid "Notes App"
-msgstr "App notas"
+msgstr "App Notas"
#: ../../Zotlabs/Module/Notes.php:56
msgid "A simple notes app with a widget (note: notes are not encrypted)"
@@ -6267,7 +6267,7 @@ msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su can
#: ../../Zotlabs/Module/Defperms.php:189
msgid "Default Permissions App"
-msgstr "App de Permisos por defecto"
+msgstr "App Permisos por defecto"
#: ../../Zotlabs/Module/Defperms.php:190
msgid "Set custom default permissions for new connections"
@@ -6319,7 +6319,7 @@ msgstr "Grupo de canales actualizado."
#: ../../Zotlabs/Module/Group.php:101
msgid "Privacy Groups App"
-msgstr "App de Grupos de canales"
+msgstr "App Grupos de canales"
#: ../../Zotlabs/Module/Group.php:102
msgid "Management of privacy groups"
@@ -7330,7 +7330,7 @@ msgstr "Buscar un canal (o un \"webbie\") que comience por:"
#: ../../Zotlabs/Module/Suggest.php:40
msgid "Suggest Channels App"
-msgstr "App de Sugerir canales"
+msgstr "App Sugerencia de canales"
#: ../../Zotlabs/Module/Suggest.php:41
msgid ""
@@ -7549,7 +7549,7 @@ msgstr "Guardar en carpeta"
#: ../../Zotlabs/Module/Probe.php:18
msgid "Remote Diagnostics App"
-msgstr "App de Diagnósticos remotos"
+msgstr "App Diagnósticos remotos"
#: ../../Zotlabs/Module/Probe.php:19
msgid "Perform diagnostics on remote channels"
@@ -8034,7 +8034,7 @@ msgstr "\"Key\" y \"Secret\" son obligatorios"
#: ../../Zotlabs/Module/Oauth.php:100
msgid "OAuth Apps Manager App"
-msgstr "App de Gestión de apps OAuth"
+msgstr "App Gestión de apps OAuth"
#: ../../Zotlabs/Module/Oauth.php:101
msgid "OAuth authentication tokens for mobile and remote apps"
@@ -8843,7 +8843,7 @@ msgstr "Añadir etiqueta"
#: ../../Zotlabs/Lib/ThreadItem.php:273 ../../include/conversation.php:891
msgid "Conversation Tools"
-msgstr "Herramientas de Conversation"
+msgstr "Herramientas de conversación"
#: ../../Zotlabs/Lib/ThreadItem.php:289 ../../include/taxonomy.php:575
msgid "like"
@@ -11185,7 +11185,7 @@ msgstr "La reputación se recupera automáticamente a esta tasa por hora hasta q
msgid ""
"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
"at this rate per hour"
-msgstr "Cuando la reputación mínima a moderar > reputación > la reputación mínima a publicar se recupera a esta tasa por hora"
+msgstr "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora "
#: ../../addon/channelreputation/channelreputation.php:138
msgid "Community Moderation Settings"
@@ -14399,7 +14399,7 @@ msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o conte
#: ../../include/features.php:138
msgid "Conversation"
-msgstr "Conversation"
+msgstr "Conversación"
#: ../../include/features.php:142
msgid "Community Tagging"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 0fd176db8..a92c1c6ea 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -149,7 +149,7 @@ App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto";
App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
App::$strings["Permission category name is required."] = "El nombre de la categoría de permiso es obligatorio.";
App::$strings["Permission category saved."] = "Se ha guardado la categoría del permiso.";
-App::$strings["Permission Categories App"] = "App de categorías de permisos";
+App::$strings["Permission Categories App"] = "App Categorías de permisos";
App::$strings["Create custom connection permission limits"] = "Crear límites de permisos de conexión personalizados";
App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones.";
App::$strings["Permission Categories"] = "Tipos de permisos";
@@ -167,7 +167,7 @@ App::$strings["Reset form"] = "Reiniciar el formulario";
App::$strings["You must enable javascript for your browser to be able to view this content."] = "Debe habilitar javascript para poder ver este contenido en su navegador.";
App::$strings["Language App"] = "App idioma";
App::$strings["Change UI language"] = "Cambiar el idioma de la interfaz de usuario";
-App::$strings["Channel Export App"] = "App de exportación de canales";
+App::$strings["Channel Export App"] = "App Exportación de canales";
App::$strings["Export your channel"] = "Exportar su canal";
App::$strings["Export Channel"] = "Exportar el canal";
App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
@@ -422,7 +422,7 @@ App::$strings["Errors encountered creating database tables."] = "Se han encontra
App::$strings["<h1>What next?</h1>"] = "<h1>¿Qué sigue?</h1>";
App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\".";
App::$strings["Continue"] = "Continuar";
-App::$strings["Premium Channel App"] = "App canal premium";
+App::$strings["Premium Channel App"] = "App Canal premium";
App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
App::$strings["Premium Channel Setup"] = "Configuración del canal premium";
App::$strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium";
@@ -809,7 +809,7 @@ App::$strings["Events Settings"] = "Gestión de eventos";
App::$strings["CalDAV Settings"] = "Ajustes de CalDav";
App::$strings["Settings saved."] = "Configuración guardada.";
App::$strings["Settings saved. Reload page please."] = "Ajustes guardados. Recargue la página, por favor.";
-App::$strings["Conversation Settings"] = "Ajustes de Conversation";
+App::$strings["Conversation Settings"] = "Ajustes de conversación";
App::$strings["Connections Settings"] = "Gestión de las conexiones";
App::$strings["Photos Settings"] = "Gestión de las fotos";
App::$strings["Not valid email."] = "Correo electrónico no válido.";
@@ -872,7 +872,7 @@ App::$strings["Upload"] = "Subir";
App::$strings["This channel is limited to %d tokens"] = "Este canal tiene un límite de %d tokens";
App::$strings["Name and Password are required."] = "Se requiere el nombre y la contraseña.";
App::$strings["Token saved."] = "Token salvado.";
-App::$strings["Guest Access App"] = "App de acceso para invitados";
+App::$strings["Guest Access App"] = "App Acceso para invitados";
App::$strings["Create access tokens so that non-members can access private content"] = "Crear tokens de acceso para que los no miembros puedan acceder a contenido privado";
App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content."] = "Utilice este formulario para crear identificadores de acceso temporal para compartir cosas con los no miembros de Hubzilla. Estas identidades se pueden usar en las Listas de control de acceso (ACL) y así los visitantes pueden iniciar sesión, utilizando estas credenciales, para acceder a su contenido privado.";
App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "También puede proporcionar, con el estilo <em>dropbox</em>, enlaces de acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión a cualquier dirección URL, como se muestra. Ejemplos: ";
@@ -947,7 +947,7 @@ App::$strings["Return to your app and insert this Security Code:"] = "Vuelva a s
App::$strings["Please login to continue."] = "Por favor inicie sesión para continuar.";
App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?";
App::$strings["Item not available."] = "Elemento no disponible";
-App::$strings["Random Channel App"] = "App canal aleatorio";
+App::$strings["Random Channel App"] = "App Canal aleatorio";
App::$strings["Visit a random channel in the \$Projectname network"] = "Visitar un canal aleatorio en la red \$Projectname";
App::$strings["Edit Block"] = "Modificar este bloque";
App::$strings["vcard"] = "vcard";
@@ -956,7 +956,7 @@ App::$strings["Installed Apps"] = "Apps instaladas";
App::$strings["Manage Apps"] = "Administrar apps";
App::$strings["Create Custom App"] = "Crear una app personalizada";
App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
-App::$strings["Mood App"] = "App estados de ánimo";
+App::$strings["Mood App"] = "App Estados de ánimo";
App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
App::$strings["Mood"] = "Estado de ánimo";
App::$strings["Active"] = "Activo/a";
@@ -996,7 +996,7 @@ App::$strings["Connections search"] = "Buscar conexiones";
App::$strings["Find"] = "Encontrar";
App::$strings["item"] = "elemento";
App::$strings["Bookmark added"] = "Marcador añadido";
-App::$strings["Bookmarks App"] = "App marcadores";
+App::$strings["Bookmarks App"] = "App Marcadores";
App::$strings["Bookmark links from posts and manage them"] = "Añadir enlaces de las entradas a Marcadores y administrarlos";
App::$strings["My Bookmarks"] = "Mis marcadores";
App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
@@ -1066,7 +1066,7 @@ App::$strings["__ctx:noun__ Dislikes"] = "No me gusta";
App::$strings["Close"] = "Cerrar";
App::$strings["Recent Photos"] = "Fotos recientes";
App::$strings["Profile Unavailable."] = "Perfil no disponible";
-App::$strings["Wiki App"] = "App wiki";
+App::$strings["Wiki App"] = "App Wiki";
App::$strings["Provide a wiki for your channel"] = "Proporcionar un wiki para su canal";
App::$strings["Invalid channel"] = "Canal no válido";
App::$strings["Error retrieving wiki"] = "Error al recuperar el wiki";
@@ -1119,7 +1119,7 @@ App::$strings["Selected Revision"] = "Revisión seleccionada";
App::$strings["You must be authenticated."] = "Debe estar autenticado.";
App::$strings["toggle full screen mode"] = "cambiar al modo de pantalla completa";
App::$strings["Layout updated."] = "Plantilla actualizada.";
-App::$strings["PDL Editor App"] = "App editor PDL";
+App::$strings["PDL Editor App"] = "App Editor PDL";
App::$strings["Provides the ability to edit system page layouts"] = "Proporciona la capacidad de editar los diseños de página del sistema";
App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas";
App::$strings["(modified)"] = "(modificado)";
@@ -1129,7 +1129,7 @@ App::$strings["Module Name:"] = "Nombre del módulo:";
App::$strings["Layout Help"] = "Ayuda para el diseño de plantillas de página";
App::$strings["Edit another layout"] = "Editar otro diseño";
App::$strings["System layout"] = "Diseño del sistema";
-App::$strings["Poke App"] = "App toques";
+App::$strings["Poke App"] = "App Toques";
App::$strings["Poke somebody in your addressbook"] = "Dar un toque a alguien en su libreta de direcciones";
App::$strings["Poke"] = "Toques y otras cosas";
App::$strings["Poke somebody"] = "Dar un toque a alguien";
@@ -1253,7 +1253,7 @@ App::$strings["Please choose the profile you would like to display to %s when vi
App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
App::$strings["Last update:"] = "Última actualización:";
App::$strings["Details"] = "Detalles";
-App::$strings["Chatrooms App"] = "App salas de chat";
+App::$strings["Chatrooms App"] = "App Salas de chat";
App::$strings["Access Controlled Chatrooms"] = "Salas de chat moderadas";
App::$strings["Room not found"] = "Sala no encontrada";
App::$strings["Leave Room"] = "Abandonar la sala";
@@ -1299,7 +1299,7 @@ App::$strings["Help"] = "Ayuda";
App::$strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
App::$strings["Layout Description"] = "Descripción de la plantilla";
App::$strings["Download PDL file"] = "Descargar el fichero PDL";
-App::$strings["Notes App"] = "App notas";
+App::$strings["Notes App"] = "App Notas";
App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Una simple aplicación de notas con un widget (aviso: las notas no están encriptadas)";
App::$strings["Not found"] = "No encontrado";
App::$strings["Please refresh page"] = "Por favor, recargue la página";
@@ -1316,7 +1316,7 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado %3
App::$strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
App::$strings["Configuration Editor"] = "Editor de configuración";
App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
-App::$strings["Default Permissions App"] = "App de Permisos por defecto";
+App::$strings["Default Permissions App"] = "App Permisos por defecto";
App::$strings["Set custom default permissions for new connections"] = "Establecer permisos predeterminados personalizados para nuevas conexiones";
App::$strings["Automatic approval settings"] = "Opciones de autorización automática";
App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Es posible que se hayan preestablecido o bloqueado algunos permisos individuales según el tipo de canal y la configuración de privacidad.";
@@ -1328,7 +1328,7 @@ App::$strings["Privacy group created."] = "El grupo de canales ha sido creado.";
App::$strings["Could not create privacy group."] = "No se puede crear el grupo de canales";
App::$strings["Privacy group not found."] = "Grupo de canales no encontrado.";
App::$strings["Privacy group updated."] = "Grupo de canales actualizado.";
-App::$strings["Privacy Groups App"] = "App de Grupos de canales";
+App::$strings["Privacy Groups App"] = "App Grupos de canales";
App::$strings["Management of privacy groups"] = "Gestión de grupos de canales";
App::$strings["Privacy Groups"] = "Grupos de canales";
App::$strings["Add Group"] = "Agregar un grupo";
@@ -1570,7 +1570,7 @@ App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo";
App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
App::$strings["Xchan Lookup"] = "Búsqueda de canales";
App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
-App::$strings["Suggest Channels App"] = "App de Sugerir canales";
+App::$strings["Suggest Channels App"] = "App Sugerencia de canales";
App::$strings["Suggestions for channels in the \$Projectname network you might be interested in"] = "Sugerencias de los canales de la red \$Projectname en los que puede estar interesado";
App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
App::$strings["Ignore/Hide"] = "Ignorar/Ocultar";
@@ -1621,7 +1621,7 @@ App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nomb
App::$strings["Enter a folder name"] = "Escriba un nombre de carpeta";
App::$strings["or select an existing folder (doubleclick)"] = "o seleccione una (con un doble click)";
App::$strings["Save to Folder"] = "Guardar en carpeta";
-App::$strings["Remote Diagnostics App"] = "App de Diagnósticos remotos";
+App::$strings["Remote Diagnostics App"] = "App Diagnósticos remotos";
App::$strings["Perform diagnostics on remote channels"] = "Realizar diagnósticos en canales remotos";
App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
@@ -1734,7 +1734,7 @@ App::$strings["Enter your email address and submit to have your password reset.
App::$strings["Email Address"] = "Dirección de correo electrónico";
App::$strings["Name is required"] = "El nombre es obligatorio";
App::$strings["Key and Secret are required"] = "\"Key\" y \"Secret\" son obligatorios";
-App::$strings["OAuth Apps Manager App"] = "App de Gestión de apps OAuth";
+App::$strings["OAuth Apps Manager App"] = "App Gestión de apps OAuth";
App::$strings["OAuth authentication tokens for mobile and remote apps"] = "Tokens de autenticación de OAuth para aplicaciones móviles y remotas";
App::$strings["Consumer Key"] = "Consumer Key";
App::$strings["Icon url"] = "Dirección del icono";
@@ -1915,7 +1915,7 @@ App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada
App::$strings["Message signature validated"] = "Firma de mensaje validada";
App::$strings["Message signature incorrect"] = "Firma de mensaje incorrecta";
App::$strings["Add Tag"] = "Añadir etiqueta";
-App::$strings["Conversation Tools"] = "Herramientas de Conversation";
+App::$strings["Conversation Tools"] = "Herramientas de conversación";
App::$strings["like"] = "me gusta";
App::$strings["dislike"] = "no me gusta";
App::$strings["Share This"] = "Compartir esto";
@@ -2464,7 +2464,7 @@ App::$strings["Max ratio of moderator's reputation that can be added to/deducted
App::$strings["Reputation \"cost\" to post"] = "\"Coste\" de la reputación a contabilizar";
App::$strings["Reputation \"cost\" to comment"] = "\"Coste\" de la reputación para comentar";
App::$strings["Reputation automatically recovers at this rate per hour until it reaches minimum_to_post"] = "La reputación se recupera automáticamente a esta tasa por hora hasta que alcanza el mínimo_a_post";
-App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "Cuando la reputación mínima a moderar > reputación > la reputación mínima a publicar se recupera a esta tasa por hora";
+App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora ";
App::$strings["Community Moderation Settings"] = "Configuración de la moderación de la comunidad";
App::$strings["Can moderate reputation on my channel."] = "Se puede moderar la reputación en mi canal.";
App::$strings["Channel Reputation"] = "Reputación del canal";
@@ -3243,7 +3243,7 @@ App::$strings["Use blog/list mode"] = "Usar el modo blog/lista";
App::$strings["Comments will be displayed separately"] = "Los comentarios se mostrarán por separado";
App::$strings["Connection Filtering"] = "Filtrado de conexiones";
App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
-App::$strings["Conversation"] = "Conversation";
+App::$strings["Conversation"] = "Conversación";
App::$strings["Community Tagging"] = "Etiquetas de la comunidad";
App::$strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
App::$strings["Emoji Reactions"] = "Emoticonos \"emoji\"";
diff --git a/view/js/main.js b/view/js/main.js
index 48277f5cc..085bc8d0d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -44,25 +44,28 @@ $(document).ready(function() {
$(document).on('click', '.conversation-settings-link', getConversationSettings);
$(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
- jQuery.timeago.settings.strings = {
- prefixAgo : aStr['t01'],
- prefixFromNow : aStr['t02'],
- suffixAgo : aStr['t03'],
- suffixFromNow : aStr['t04'],
- seconds : aStr['t05'],
- minute : aStr['t06'],
- minutes : aStr['t07'],
- hour : aStr['t08'],
- hours : aStr['t09'],
- day : aStr['t10'],
- days : aStr['t11'],
- month : aStr['t12'],
- months : aStr['t13'],
- year : aStr['t14'],
- years : aStr['t15'],
- wordSeparator : aStr['t16'],
- numbers : aStr['t17'],
- };
+ var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
+
+ jQuery.timeago.settings.strings = {
+ prefixAgo : aStr['t01'],
+ prefixFromNow : aStr['t02'],
+ suffixAgo : aStr['t03'],
+ suffixFromNow : aStr['t04'],
+ seconds : aStr['t05'],
+ minute : aStr['t06'],
+ minutes : function(value){return tf(value, aStr['t07']);},
+ hour : aStr['t08'],
+ hours : function(value){return tf(value, aStr['t09']);},
+ day : aStr['t10'],
+ days : function(value){return tf(value, aStr['t11']);},
+ month : aStr['t12'],
+ months : function(value){return tf(value, aStr['t13']);},
+ year : aStr['t14'],
+ years : function(value){return tf(value, aStr['t15']);},
+ wordSeparator : aStr['t16'],
+ numbers : aStr['t17'],
+ };
+
//mod_mail only
$(".mail-conv-detail .autotime").timeago();
diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po
index d61db8c53..d21f707d1 100644
--- a/view/ru/hmessages.po
+++ b/view/ru/hmessages.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: hubzilla\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-25 21:40+0200\n"
-"PO-Revision-Date: 2018-10-07 13:05+0200\n"
+"POT-Creation-Date: 2018-10-18 11:03+0200\n"
+"PO-Revision-Date: 2018-10-18 11:06+0200\n"
"Last-Translator: Max Kostikov <max@kostikov.co>\n"
"Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
msgid "Source channel not found."
msgstr "Канал-источник не найден."
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087
#: ../../Zotlabs/Module/Admin/Site.php:187
msgid "Default"
msgstr "По умолчанию"
@@ -36,7 +36,7 @@ msgid "Focus (Hubzilla default)"
msgstr "Фокус (по умолчанию Hubzilla)"
#: ../../view/theme/redbasic/php/config.php:94 ../../include/js_strings.php:22
-#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Pconfig.php:111
#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Permcats.php:128
#: ../../Zotlabs/Module/Xchan.php:15
#: ../../Zotlabs/Module/Email_validation.php:40
@@ -85,8 +85,8 @@ msgstr "Фокус (по умолчанию Hubzilla)"
#: ../../Zotlabs/Module/Pdledit.php:107 ../../Zotlabs/Module/Wiki.php:215
#: ../../Zotlabs/Module/Import.php:565
#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
+#: ../../Zotlabs/Widget/Wiki_pages.php:42
+#: ../../Zotlabs/Widget/Wiki_pages.php:99
#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Lib/ThreadItem.php:767
#: ../../extend/addon/hzaddons/dwpost/dwpost.php:89
#: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:191
@@ -319,7 +319,7 @@ msgstr "Панель навигации, цвет активного значк
#: ../../view/theme/redbasic/php/config.php:103
msgid "Link color"
-msgstr "цвет ссылок"
+msgstr "Цвет ссылок"
#: ../../view/theme/redbasic/php/config.php:104
msgid "Set font-color for banner"
@@ -673,7 +673,7 @@ msgstr "Спроси меня"
#: ../../Zotlabs/Module/Item.php:229 ../../Zotlabs/Module/Item.php:248
#: ../../Zotlabs/Module/Item.php:258 ../../Zotlabs/Module/Item.php:1110
#: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Poke.php:157
+#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Poke.php:157
#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Profiles.php:198
#: ../../Zotlabs/Module/Profiles.php:635 ../../Zotlabs/Module/Photos.php:69
@@ -721,8 +721,8 @@ msgstr "Спроси меня"
#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Invite.php:21
#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Articles.php:80
#: ../../Zotlabs/Module/Cloud.php:40 ../../Zotlabs/Module/Pdledit.php:34
-#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:282
-#: ../../Zotlabs/Module/Wiki.php:415 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285
+#: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Manage.php:10
#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Cards.php:81
#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Web/WebServer.php:123
@@ -892,7 +892,7 @@ msgstr "Просмотреть все %d общих контактов"
#: ../../Zotlabs/Module/Connections.php:342
#: ../../Zotlabs/Module/Card_edit.php:99
#: ../../Zotlabs/Module/Article_edit.php:99 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384
#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Widget/Cdav.php:126
#: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Lib/Apps.php:534
#: ../../Zotlabs/Lib/ThreadItem.php:130
@@ -1255,7 +1255,7 @@ msgid "Visible to specific connections."
msgstr "Видно указанным контактам."
#: ../../include/items.php:3587 ../../Zotlabs/Module/Display.php:45
-#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Admin.php:62
+#: ../../Zotlabs/Module/Display.php:452 ../../Zotlabs/Module/Admin.php:62
#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Viewsrc.php:25
#: ../../Zotlabs/Module/Admin/Addons.php:259
#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94
@@ -1874,47 +1874,47 @@ msgstr "расслабленный"
msgid "surprised"
msgstr "удивленный"
-#: ../../include/text.php:1377 ../../include/js_strings.php:86
+#: ../../include/text.php:1377 ../../include/js_strings.php:95
msgid "Monday"
msgstr "Понедельник"
-#: ../../include/text.php:1377 ../../include/js_strings.php:87
+#: ../../include/text.php:1377 ../../include/js_strings.php:96
msgid "Tuesday"
msgstr "Вторник"
-#: ../../include/text.php:1377 ../../include/js_strings.php:88
+#: ../../include/text.php:1377 ../../include/js_strings.php:97
msgid "Wednesday"
msgstr "Среда"
-#: ../../include/text.php:1377 ../../include/js_strings.php:89
+#: ../../include/text.php:1377 ../../include/js_strings.php:98
msgid "Thursday"
msgstr "Четверг"
-#: ../../include/text.php:1377 ../../include/js_strings.php:90
+#: ../../include/text.php:1377 ../../include/js_strings.php:99
msgid "Friday"
msgstr "Пятница"
-#: ../../include/text.php:1377 ../../include/js_strings.php:91
+#: ../../include/text.php:1377 ../../include/js_strings.php:100
msgid "Saturday"
msgstr "Суббота"
-#: ../../include/text.php:1377 ../../include/js_strings.php:85
+#: ../../include/text.php:1377 ../../include/js_strings.php:94
msgid "Sunday"
msgstr "Воскресенье"
-#: ../../include/text.php:1381 ../../include/js_strings.php:61
+#: ../../include/text.php:1381 ../../include/js_strings.php:70
msgid "January"
msgstr "Январь"
-#: ../../include/text.php:1381 ../../include/js_strings.php:62
+#: ../../include/text.php:1381 ../../include/js_strings.php:71
msgid "February"
msgstr "Февраль"
-#: ../../include/text.php:1381 ../../include/js_strings.php:63
+#: ../../include/text.php:1381 ../../include/js_strings.php:72
msgid "March"
msgstr "Март"
-#: ../../include/text.php:1381 ../../include/js_strings.php:64
+#: ../../include/text.php:1381 ../../include/js_strings.php:73
msgid "April"
msgstr "Апрель"
@@ -1922,31 +1922,31 @@ msgstr "Апрель"
msgid "May"
msgstr "Май"
-#: ../../include/text.php:1381 ../../include/js_strings.php:66
+#: ../../include/text.php:1381 ../../include/js_strings.php:75
msgid "June"
msgstr "Июнь"
-#: ../../include/text.php:1381 ../../include/js_strings.php:67
+#: ../../include/text.php:1381 ../../include/js_strings.php:76
msgid "July"
msgstr "Июль"
-#: ../../include/text.php:1381 ../../include/js_strings.php:68
+#: ../../include/text.php:1381 ../../include/js_strings.php:77
msgid "August"
msgstr "Август"
-#: ../../include/text.php:1381 ../../include/js_strings.php:69
+#: ../../include/text.php:1381 ../../include/js_strings.php:78
msgid "September"
msgstr "Сентябрь"
-#: ../../include/text.php:1381 ../../include/js_strings.php:70
+#: ../../include/text.php:1381 ../../include/js_strings.php:79
msgid "October"
msgstr "Октябрь"
-#: ../../include/text.php:1381 ../../include/js_strings.php:71
+#: ../../include/text.php:1381 ../../include/js_strings.php:80
msgid "November"
msgstr "Ноябрь"
-#: ../../include/text.php:1381 ../../include/js_strings.php:72
+#: ../../include/text.php:1381 ../../include/js_strings.php:81
msgid "December"
msgstr "Декабрь"
@@ -1976,7 +1976,7 @@ msgstr "удалить из файла"
msgid "Link to Source"
msgstr "Ссылка на источник"
-#: ../../include/text.php:1872 ../../include/language.php:397
+#: ../../include/text.php:1872 ../../include/language.php:423
msgid "default"
msgstr "по умолчанию"
@@ -1989,8 +1989,8 @@ msgid "You can create your own with the layouts tool"
msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов"
#: ../../include/text.php:1890 ../../Zotlabs/Module/Wiki.php:217
-#: ../../Zotlabs/Module/Wiki.php:359 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93
+#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95
msgid "BBcode"
msgstr ""
@@ -1999,15 +1999,15 @@ msgid "HTML"
msgstr ""
#: ../../include/text.php:1892 ../../Zotlabs/Module/Wiki.php:217
-#: ../../Zotlabs/Module/Wiki.php:359 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93
+#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95
#: ../../extend/addon/hzaddons/mdpost/mdpost.php:41
msgid "Markdown"
msgstr "Разметка Markdown"
#: ../../include/text.php:1893 ../../Zotlabs/Module/Wiki.php:217
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95
msgid "Text"
msgstr "Текст"
@@ -2342,7 +2342,7 @@ msgstr "Не найдено"
#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140
#: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:174
#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Web/Router.php:185 ../../Zotlabs/Lib/NativeWikiPage.php:519
+#: ../../Zotlabs/Web/Router.php:185 ../../Zotlabs/Lib/NativeWikiPage.php:521
msgid "Page not found."
msgstr "Страница не найдена."
@@ -2418,7 +2418,7 @@ msgid "View summary"
msgstr "Просмотр резюме"
#: ../../include/bbcode.php:746 ../../include/bbcode.php:916
-#: ../../Zotlabs/Lib/NativeWikiPage.php:600
+#: ../../Zotlabs/Lib/NativeWikiPage.php:603
msgid "Different viewers will see this text differently"
msgstr "Различные зрители увидят этот текст по-разному"
@@ -2756,13 +2756,13 @@ msgid "Where are you right now?"
msgstr "Где вы сейчас?"
#: ../../include/conversation.php:1342 ../../Zotlabs/Module/Cover_photo.php:401
-#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:403
#: ../../extend/addon/hzaddons/hsse/hsse.php:139
msgid "Choose images to embed"
msgstr "Выбрать изображения для встраивания"
#: ../../include/conversation.php:1343 ../../Zotlabs/Module/Cover_photo.php:402
-#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:404
#: ../../extend/addon/hzaddons/hsse/hsse.php:140
msgid "Choose an album"
msgstr "Выбрать альбом"
@@ -2773,19 +2773,19 @@ msgid "Choose a different album..."
msgstr "Выбрать другой альбом..."
#: ../../include/conversation.php:1345 ../../Zotlabs/Module/Cover_photo.php:404
-#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:406
#: ../../extend/addon/hzaddons/hsse/hsse.php:142
msgid "Error getting album list"
msgstr "Ошибка получения списка альбомов"
#: ../../include/conversation.php:1346 ../../Zotlabs/Module/Cover_photo.php:405
-#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:394
+#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:407
#: ../../extend/addon/hzaddons/hsse/hsse.php:143
msgid "Error getting photo link"
msgstr "Ошибка получения ссылки на фотографию"
#: ../../include/conversation.php:1347 ../../Zotlabs/Module/Cover_photo.php:406
-#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:395
+#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:408
#: ../../extend/addon/hzaddons/hsse/hsse.php:144
msgid "Error getting album"
msgstr "Ошибка получения альбома"
@@ -2809,7 +2809,7 @@ msgstr "Предварительный просмотр"
#: ../../include/conversation.php:1389 ../../Zotlabs/Module/Photos.php:1104
#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194
#: ../../Zotlabs/Widget/Cdav.php:124
#: ../../extend/addon/hzaddons/hsse/hsse.php:186
msgid "Share"
@@ -2855,7 +2855,7 @@ msgstr "Код"
msgid "Attach/Upload file"
msgstr "Прикрепить/загрузить файл"
-#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:387
+#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:400
#: ../../extend/addon/hzaddons/hsse/hsse.php:208
msgid "Embed an image from your albums"
msgstr "Встроить изображение из ваших альбомов"
@@ -2874,8 +2874,8 @@ msgstr "Встроить изображение из ваших альбомов
#: ../../Zotlabs/Module/Profile_photo.php:465
#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Connedit.php:925
#: ../../Zotlabs/Module/Card_edit.php:131
-#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:356
-#: ../../Zotlabs/Module/Wiki.php:388 ../../Zotlabs/Module/Filer.php:55
+#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:368
+#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Filer.php:55
#: ../../extend/addon/hzaddons/hsse/hsse.php:209
#: ../../extend/addon/hzaddons/hsse/hsse.php:258
msgid "Cancel"
@@ -2883,7 +2883,7 @@ msgstr "Отменить"
#: ../../include/conversation.php:1413 ../../include/conversation.php:1460
#: ../../Zotlabs/Module/Cover_photo.php:400
-#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:389
+#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:402
#: ../../extend/addon/hzaddons/hsse/hsse.php:210
#: ../../extend/addon/hzaddons/hsse/hsse.php:257
msgid "OK"
@@ -3045,7 +3045,7 @@ msgstr "не нравится"
msgid "dislikes"
msgstr "не нравится"
-#: ../../include/language.php:410
+#: ../../include/language.php:436
msgid "Select an alternate language"
msgstr "Выбор дополнительного языка"
@@ -3181,181 +3181,196 @@ msgid " channel name"
msgstr " название канала"
#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d minutes"
+msgid_plural "%d minutes"
+msgstr[0] "%d минуту"
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
+
+#: ../../include/js_strings.php:42
+#, php-format
+msgid "about %d hours"
+msgid_plural "about %d hours"
+msgstr[0] "около %d часa"
+msgstr[1] "около %d часов"
+msgstr[2] "около %d часов"
+
+#: ../../include/js_strings.php:43
+#, php-format
+msgid "%d days"
+msgid_plural "%d days"
+msgstr[0] "%d день"
+msgstr[1] "%d дня"
+msgstr[2] "%d дней"
+
+#: ../../include/js_strings.php:44
+#, php-format
+msgid "%d months"
+msgid_plural "%d months"
+msgstr[0] "%d месяц"
+msgstr[1] "%d месяца"
+msgstr[2] "%d месяцев"
+
+#: ../../include/js_strings.php:45
+#, php-format
+msgid "%d years"
+msgid_plural "%d years"
+msgstr[0] "%d год"
+msgstr[1] "%d года"
+msgstr[2] "%d лет"
+
+#: ../../include/js_strings.php:50
msgid "timeago.prefixAgo"
msgstr ""
-#: ../../include/js_strings.php:42
+#: ../../include/js_strings.php:51
msgid "timeago.prefixFromNow"
-msgstr ""
+msgstr "через"
-#: ../../include/js_strings.php:43
+#: ../../include/js_strings.php:52
msgid "timeago.suffixAgo"
msgstr "назад"
-#: ../../include/js_strings.php:44
+#: ../../include/js_strings.php:53
msgid "timeago.suffixFromNow"
msgstr ""
-#: ../../include/js_strings.php:47
+#: ../../include/js_strings.php:56
msgid "less than a minute"
msgstr "менее чем одну минуту"
-#: ../../include/js_strings.php:48
+#: ../../include/js_strings.php:57
msgid "about a minute"
msgstr "около минуты"
-#: ../../include/js_strings.php:49
-#, php-format
-msgid "%d minutes"
-msgstr "%d минут"
-
-#: ../../include/js_strings.php:50
+#: ../../include/js_strings.php:59
msgid "about an hour"
msgstr "около часа"
-#: ../../include/js_strings.php:51
-#, php-format
-msgid "about %d hours"
-msgstr "около %d часов"
-
-#: ../../include/js_strings.php:52
+#: ../../include/js_strings.php:61
msgid "a day"
msgstr "день"
-#: ../../include/js_strings.php:53
-#, php-format
-msgid "%d days"
-msgstr "%d дней"
-
-#: ../../include/js_strings.php:54
+#: ../../include/js_strings.php:63
msgid "about a month"
msgstr "около месяца"
-#: ../../include/js_strings.php:55
-#, php-format
-msgid "%d months"
-msgstr "%d месяцев"
-
-#: ../../include/js_strings.php:56
+#: ../../include/js_strings.php:65
msgid "about a year"
msgstr "около года"
-#: ../../include/js_strings.php:57
-#, php-format
-msgid "%d years"
-msgstr "%d лет"
-
-#: ../../include/js_strings.php:58
+#: ../../include/js_strings.php:67
msgid " "
msgstr " "
-#: ../../include/js_strings.php:59
+#: ../../include/js_strings.php:68
msgid "timeago.numbers"
msgstr ""
-#: ../../include/js_strings.php:65
+#: ../../include/js_strings.php:74
msgctxt "long"
msgid "May"
msgstr "Май"
-#: ../../include/js_strings.php:73
+#: ../../include/js_strings.php:82
msgid "Jan"
msgstr "Янв"
-#: ../../include/js_strings.php:74
+#: ../../include/js_strings.php:83
msgid "Feb"
msgstr "Фев"
-#: ../../include/js_strings.php:75
+#: ../../include/js_strings.php:84
msgid "Mar"
msgstr "Мар"
-#: ../../include/js_strings.php:76
+#: ../../include/js_strings.php:85
msgid "Apr"
msgstr "Апр"
-#: ../../include/js_strings.php:77
+#: ../../include/js_strings.php:86
msgctxt "short"
msgid "May"
msgstr "Май"
-#: ../../include/js_strings.php:78
+#: ../../include/js_strings.php:87
msgid "Jun"
msgstr "Июн"
-#: ../../include/js_strings.php:79
+#: ../../include/js_strings.php:88
msgid "Jul"
msgstr "Июл"
-#: ../../include/js_strings.php:80
+#: ../../include/js_strings.php:89
msgid "Aug"
msgstr "Авг"
-#: ../../include/js_strings.php:81
+#: ../../include/js_strings.php:90
msgid "Sep"
msgstr "Сен"
-#: ../../include/js_strings.php:82
+#: ../../include/js_strings.php:91
msgid "Oct"
msgstr "Окт"
-#: ../../include/js_strings.php:83
+#: ../../include/js_strings.php:92
msgid "Nov"
msgstr "Ноя"
-#: ../../include/js_strings.php:84
+#: ../../include/js_strings.php:93
msgid "Dec"
msgstr "Дек"
-#: ../../include/js_strings.php:92
+#: ../../include/js_strings.php:101
msgid "Sun"
msgstr "Вск"
-#: ../../include/js_strings.php:93
+#: ../../include/js_strings.php:102
msgid "Mon"
msgstr "Пон"
-#: ../../include/js_strings.php:94
+#: ../../include/js_strings.php:103
msgid "Tue"
msgstr "Вт"
-#: ../../include/js_strings.php:95
+#: ../../include/js_strings.php:104
msgid "Wed"
msgstr "Ср"
-#: ../../include/js_strings.php:96
+#: ../../include/js_strings.php:105
msgid "Thu"
msgstr "Чет"
-#: ../../include/js_strings.php:97
+#: ../../include/js_strings.php:106
msgid "Fri"
msgstr "Пят"
-#: ../../include/js_strings.php:98
+#: ../../include/js_strings.php:107
msgid "Sat"
msgstr "Суб"
-#: ../../include/js_strings.php:99
+#: ../../include/js_strings.php:108
msgctxt "calendar"
msgid "today"
msgstr "сегодня"
-#: ../../include/js_strings.php:100
+#: ../../include/js_strings.php:109
msgctxt "calendar"
msgid "month"
msgstr "месяц"
-#: ../../include/js_strings.php:101
+#: ../../include/js_strings.php:110
msgctxt "calendar"
msgid "week"
msgstr "неделя"
-#: ../../include/js_strings.php:102
+#: ../../include/js_strings.php:111
msgctxt "calendar"
msgid "day"
msgstr "день"
-#: ../../include/js_strings.php:103
+#: ../../include/js_strings.php:112
msgctxt "calendar"
msgid "All day"
msgstr "Весь день"
@@ -3376,27 +3391,27 @@ msgstr "Только публичные форумы"
msgid "This Website Only"
msgstr "Только этот веб-сайт"
-#: ../../include/network.php:760
+#: ../../include/network.php:770
msgid "view full size"
msgstr "посмотреть в полный размер"
-#: ../../include/network.php:1763 ../../include/network.php:1764
+#: ../../include/network.php:1773 ../../include/network.php:1774
msgid "Friendica"
msgstr ""
-#: ../../include/network.php:1765
+#: ../../include/network.php:1775
msgid "OStatus"
msgstr ""
-#: ../../include/network.php:1766
+#: ../../include/network.php:1776
msgid "GNU-Social"
msgstr ""
-#: ../../include/network.php:1767
+#: ../../include/network.php:1777
msgid "RSS/Atom"
msgstr ""
-#: ../../include/network.php:1768 ../../Zotlabs/Lib/Activity.php:1417
+#: ../../include/network.php:1778 ../../Zotlabs/Lib/Activity.php:1417
#: ../../Zotlabs/Lib/Activity.php:1614
#: ../../extend/addon/hzaddons/pubcrawl/as.php:1222
#: ../../extend/addon/hzaddons/pubcrawl/as.php:1377
@@ -3404,7 +3419,7 @@ msgstr ""
msgid "ActivityPub"
msgstr ""
-#: ../../include/network.php:1769 ../../Zotlabs/Module/Cdav.php:1219
+#: ../../include/network.php:1779 ../../Zotlabs/Module/Cdav.php:1219
#: ../../Zotlabs/Module/Profiles.php:787
#: ../../Zotlabs/Module/Admin/Accounts.php:171
#: ../../Zotlabs/Module/Admin/Accounts.php:183
@@ -3416,27 +3431,27 @@ msgstr ""
msgid "Email"
msgstr "Электронная почта"
-#: ../../include/network.php:1770
+#: ../../include/network.php:1780
msgid "Diaspora"
msgstr ""
-#: ../../include/network.php:1771
+#: ../../include/network.php:1781
msgid "Facebook"
msgstr ""
-#: ../../include/network.php:1772
+#: ../../include/network.php:1782
msgid "Zot"
msgstr ""
-#: ../../include/network.php:1773
+#: ../../include/network.php:1783
msgid "LinkedIn"
msgstr ""
-#: ../../include/network.php:1774
+#: ../../include/network.php:1784
msgid "XMPP/IM"
msgstr ""
-#: ../../include/network.php:1775
+#: ../../include/network.php:1785
msgid "MySpace"
msgstr ""
@@ -4080,7 +4095,7 @@ msgstr "Удалено администратором"
#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Group.php:144
#: ../../Zotlabs/Module/Wiki.php:218
#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../Zotlabs/Lib/NativeWikiPage.php:558
+#: ../../Zotlabs/Lib/NativeWikiPage.php:561
#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172
msgid "Name"
msgstr "Имя"
@@ -4250,15 +4265,15 @@ msgstr "Отправить ответ"
msgid "Your message for %s (%s):"
msgstr "Ваше сообщение для %s (%s):"
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63
msgid "This setting requires special processing and editing has been blocked."
msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован."
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Zotlabs/Module/Pconfig.php:52
msgid "Configuration Editor"
msgstr "Редактор конфигурации"
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Zotlabs/Module/Pconfig.php:53
msgid ""
"Warning: Changing some settings could render your channel inoperable. Please "
"leave this page unless you are comfortable with and knowledgeable about how "
@@ -4467,8 +4482,8 @@ msgstr "почта доставлен"
msgid "Delivery report for %1$s"
msgstr "Отчёт о доставке для %1$s"
-#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Widget/Wiki_pages.php:98
msgid "Options"
msgstr "Параметры"
@@ -4593,16 +4608,16 @@ msgstr "Некоторые предложения о том, что делать
msgid "Public access denied."
msgstr "Публичный доступ запрещен."
-#: ../../Zotlabs/Module/Display.php:375 ../../Zotlabs/Module/Channel.php:424
+#: ../../Zotlabs/Module/Display.php:374 ../../Zotlabs/Module/Channel.php:424
msgid ""
"You must enable javascript for your browser to be able to view this content."
msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript"
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Zotlabs/Module/Display.php:393
msgid "Article"
msgstr "Статья"
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Zotlabs/Module/Display.php:445
msgid "Item has been removed."
msgstr "Элемент был удалён."
@@ -5985,7 +6000,7 @@ msgstr "Создать событие"
#: ../../Zotlabs/Module/Events.php:695 ../../Zotlabs/Module/Pubsites.php:60
#: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396
+#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409
#: ../../Zotlabs/Module/Layouts.php:198
msgid "View"
msgstr "Просмотр"
@@ -6161,7 +6176,7 @@ msgid "Use a photo from your albums"
msgstr "Использовать фотографию из ваших альбомов"
#: ../../Zotlabs/Module/Cover_photo.php:403
-#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:392
+#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:405
msgid "Choose a different album"
msgstr "Выбрать другой альбом"
@@ -6820,7 +6835,7 @@ msgid "Link post titles to source"
msgstr "Ссылки на источник заголовков публикаций"
#: ../../Zotlabs/Module/Settings/Display.php:205
-#: ../../Zotlabs/Widget/Newmember.php:69
+#: ../../Zotlabs/Widget/Newmember.php:75
msgid "New Member Links"
msgstr "Ссылки для новичков"
@@ -8850,9 +8865,9 @@ msgstr "Домашняя страница, которая будет показ
#: ../../Zotlabs/Module/Admin/Site.php:314
msgid ""
-"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
"webpage called 'home' or 'include:home.html' to include a file."
-msgstr "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла."
+msgstr "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла."
#: ../../Zotlabs/Module/Admin/Site.php:315
msgid "Preserve site homepage URL"
@@ -10413,7 +10428,7 @@ msgstr "Предоставьте Wiki для вашего канала"
#: ../../Zotlabs/Module/Wiki.php:77
#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:456
#: ../../extend/addon/hzaddons/cart/myshop.php:37
-#: ../../extend/addon/hzaddons/cart/manual_payments.php:63
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:93
#: ../../extend/addon/hzaddons/cart/cart.php:1440
msgid "Invalid channel"
msgstr "Недействительный канал"
@@ -10458,101 +10473,101 @@ msgstr "Создать публикацию о статусе этой Wiki"
msgid "Edit Wiki Name"
msgstr "Редактировать наименование Wiki"
-#: ../../Zotlabs/Module/Wiki.php:271
+#: ../../Zotlabs/Module/Wiki.php:274
msgid "Wiki not found"
msgstr "Wiki не найдена"
-#: ../../Zotlabs/Module/Wiki.php:295
+#: ../../Zotlabs/Module/Wiki.php:300
msgid "Rename page"
msgstr "Переименовать страницу"
-#: ../../Zotlabs/Module/Wiki.php:316
+#: ../../Zotlabs/Module/Wiki.php:321
msgid "Error retrieving page content"
msgstr "Ошибка при получении содержимого страницы"
-#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326
+#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331
msgid "New page"
msgstr "Новая страница"
-#: ../../Zotlabs/Module/Wiki.php:354
+#: ../../Zotlabs/Module/Wiki.php:366
msgid "Revision Comparison"
msgstr "Сравнение ревизий"
-#: ../../Zotlabs/Module/Wiki.php:355
+#: ../../Zotlabs/Module/Wiki.php:367
#: ../../Zotlabs/Widget/Wiki_page_history.php:25
-#: ../../Zotlabs/Lib/NativeWikiPage.php:561
+#: ../../Zotlabs/Lib/NativeWikiPage.php:564
msgid "Revert"
msgstr "Отменить"
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Zotlabs/Module/Wiki.php:374
msgid "Short description of your changes (optional)"
msgstr "Краткое описание ваших изменений (необязательно)"
-#: ../../Zotlabs/Module/Wiki.php:371
+#: ../../Zotlabs/Module/Wiki.php:384
msgid "Source"
msgstr "Источник"
-#: ../../Zotlabs/Module/Wiki.php:381
+#: ../../Zotlabs/Module/Wiki.php:394
msgid "New page name"
msgstr "Новое имя страницы"
-#: ../../Zotlabs/Module/Wiki.php:386
+#: ../../Zotlabs/Module/Wiki.php:399
msgid "Embed image from photo albums"
msgstr "Встроить изображение из фотоальбома"
-#: ../../Zotlabs/Module/Wiki.php:397
+#: ../../Zotlabs/Module/Wiki.php:410
msgid "History"
msgstr "История"
-#: ../../Zotlabs/Module/Wiki.php:473
+#: ../../Zotlabs/Module/Wiki.php:488
msgid "Error creating wiki. Invalid name."
msgstr "Ошибка создания Wiki. Неверное имя."
-#: ../../Zotlabs/Module/Wiki.php:480
+#: ../../Zotlabs/Module/Wiki.php:495
msgid "A wiki with this name already exists."
msgstr "Wiki с таким именем уже существует."
-#: ../../Zotlabs/Module/Wiki.php:493
+#: ../../Zotlabs/Module/Wiki.php:508
msgid "Wiki created, but error creating Home page."
msgstr "Wiki создана, но возникла ошибка при создании домашней страницы"
-#: ../../Zotlabs/Module/Wiki.php:500
+#: ../../Zotlabs/Module/Wiki.php:515
msgid "Error creating wiki"
msgstr "Ошибка при создании Wiki"
-#: ../../Zotlabs/Module/Wiki.php:523
+#: ../../Zotlabs/Module/Wiki.php:539
msgid "Error updating wiki. Invalid name."
msgstr "Ошибка при обновлении Wiki. Неверное имя."
-#: ../../Zotlabs/Module/Wiki.php:543
+#: ../../Zotlabs/Module/Wiki.php:559
msgid "Error updating wiki"
msgstr "Ошибка при обновлении Wiki"
-#: ../../Zotlabs/Module/Wiki.php:558
+#: ../../Zotlabs/Module/Wiki.php:574
msgid "Wiki delete permission denied."
msgstr "Нет прав на удаление Wiki."
-#: ../../Zotlabs/Module/Wiki.php:568
+#: ../../Zotlabs/Module/Wiki.php:584
msgid "Error deleting wiki"
msgstr "Ошибка удаления Wiki"
-#: ../../Zotlabs/Module/Wiki.php:601
+#: ../../Zotlabs/Module/Wiki.php:617
msgid "New page created"
msgstr "Создана новая страница"
-#: ../../Zotlabs/Module/Wiki.php:722
+#: ../../Zotlabs/Module/Wiki.php:739
msgid "Cannot delete Home"
msgstr "Невозможно удалить домашнюю страницу"
-#: ../../Zotlabs/Module/Wiki.php:786
+#: ../../Zotlabs/Module/Wiki.php:803
msgid "Current Revision"
msgstr "Текущая ревизия"
-#: ../../Zotlabs/Module/Wiki.php:786
+#: ../../Zotlabs/Module/Wiki.php:803
msgid "Selected Revision"
msgstr "Выбранная ревизия"
-#: ../../Zotlabs/Module/Wiki.php:836
+#: ../../Zotlabs/Module/Wiki.php:853
msgid "You must be authenticated."
msgstr "Вы должны быть аутентифицированы."
@@ -11240,7 +11255,19 @@ msgstr "Просмотреть ваш сетевой поток"
msgid "Documentation"
msgstr "Документация"
-#: ../../Zotlabs/Widget/Newmember.php:65
+#: ../../Zotlabs/Widget/Newmember.php:57
+msgid "Missing Features?"
+msgstr "Отсутствует функция?"
+
+#: ../../Zotlabs/Widget/Newmember.php:59
+msgid "Pin apps to navigation bar"
+msgstr "Прикрепить приложение к панели"
+
+#: ../../Zotlabs/Widget/Newmember.php:60
+msgid "Install more apps"
+msgstr "Установить больше приложений"
+
+#: ../../Zotlabs/Widget/Newmember.php:71
msgid "View public stream"
msgstr "Просмотреть публичный поток"
@@ -11264,16 +11291,16 @@ msgstr "Исходящие"
msgid "New Message"
msgstr "Новое сообщение"
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89
+#: ../../Zotlabs/Widget/Wiki_pages.php:34
+#: ../../Zotlabs/Widget/Wiki_pages.php:91
msgid "Add new page"
msgstr "Добавить новую страницу"
-#: ../../Zotlabs/Widget/Wiki_pages.php:83
+#: ../../Zotlabs/Widget/Wiki_pages.php:85
msgid "Wiki Pages"
msgstr "Wiki страницы"
-#: ../../Zotlabs/Widget/Wiki_pages.php:94
+#: ../../Zotlabs/Widget/Wiki_pages.php:96
msgid "Page name"
msgstr "Название страницы"
@@ -11464,24 +11491,24 @@ msgid "Delete conversation"
msgstr "Удалить беседу"
#: ../../Zotlabs/Widget/Wiki_page_history.php:23
-#: ../../Zotlabs/Lib/NativeWikiPage.php:559
+#: ../../Zotlabs/Lib/NativeWikiPage.php:562
msgctxt "wiki_history"
msgid "Message"
msgstr "Сообщение"
#: ../../Zotlabs/Widget/Wiki_page_history.php:24
-#: ../../Zotlabs/Lib/NativeWikiPage.php:560
+#: ../../Zotlabs/Lib/NativeWikiPage.php:563
msgid "Date"
msgstr "Дата"
#: ../../Zotlabs/Widget/Wiki_page_history.php:26
-#: ../../Zotlabs/Lib/NativeWikiPage.php:562
+#: ../../Zotlabs/Lib/NativeWikiPage.php:565
msgid "Compare"
msgstr "Сравнить"
#: ../../Zotlabs/Access/Permissions.php:56
msgid "Can view my channel stream and posts"
-msgstr "Может просматривать мою ленту и сообщения"
+msgstr "Может просматривать мой поток и сообщения"
#: ../../Zotlabs/Access/Permissions.php:57
msgid "Can send me their channel stream and posts"
@@ -11501,7 +11528,7 @@ msgstr "Может просматривать мое хранилище файл
#: ../../Zotlabs/Access/Permissions.php:61
msgid "Can upload/modify my file storage and photos"
-msgstr "Может загружать/изменять мои файлы и фотографии в хранилище"
+msgstr "Может загружать/изменять мои файлы и фотографии в хранилище"
#: ../../Zotlabs/Access/Permissions.php:62
msgid "Can view my channel webpages"
@@ -11896,59 +11923,59 @@ msgid "edited a comment dated %s"
msgstr "отредактировал комментарий датированный %s"
#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:93
+#: ../../Zotlabs/Lib/NativeWikiPage.php:94
msgid "(No Title)"
msgstr "(нет заголовка)"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:107
+#: ../../Zotlabs/Lib/NativeWikiPage.php:109
msgid "Wiki page create failed."
msgstr "Не удалось создать страницу Wiki."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:120
+#: ../../Zotlabs/Lib/NativeWikiPage.php:122
msgid "Wiki not found."
msgstr "Wiki не найдена."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:131
+#: ../../Zotlabs/Lib/NativeWikiPage.php:133
msgid "Destination name already exists"
msgstr "Имя назначения уже существует"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:163
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+#: ../../Zotlabs/Lib/NativeWikiPage.php:362
msgid "Page not found"
msgstr "Страница не найдена."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:194
+#: ../../Zotlabs/Lib/NativeWikiPage.php:197
msgid "Error reading page content"
msgstr "Ошибка чтения содержимого страницы"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:400
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Zotlabs/Lib/NativeWikiPage.php:353
+#: ../../Zotlabs/Lib/NativeWikiPage.php:402
+#: ../../Zotlabs/Lib/NativeWikiPage.php:469
+#: ../../Zotlabs/Lib/NativeWikiPage.php:510
msgid "Error reading wiki"
msgstr "Ошибка чтения Wiki"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:388
+#: ../../Zotlabs/Lib/NativeWikiPage.php:390
msgid "Page update failed."
msgstr "Не удалось обновить страницу."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:422
+#: ../../Zotlabs/Lib/NativeWikiPage.php:424
msgid "Nothing deleted"
msgstr "Ничего не удалено"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:488
+#: ../../Zotlabs/Lib/NativeWikiPage.php:490
msgid "Compare: object not found."
msgstr "Сравнение: объект не найден."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:494
+#: ../../Zotlabs/Lib/NativeWikiPage.php:496
msgid "Page updated"
msgstr "Страница обновлена"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+#: ../../Zotlabs/Lib/NativeWikiPage.php:499
msgid "Untitled"
msgstr "Не озаглавлено"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:503
+#: ../../Zotlabs/Lib/NativeWikiPage.php:505
msgid "Wiki resource_id required for git commit"
msgstr "Требуется resource_id Wiki для отправки в Git"
@@ -12312,11 +12339,11 @@ msgstr "4. Эксперт - я умею программировать"
msgid "5. Wizard - I probably know more than you do"
msgstr "5. Волшебник - возможно я знаю больше чем ты"
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Zotlabs/Lib/NativeWiki.php:152
msgid "Wiki updated successfully"
msgstr "Wiki успешно обновлена"
-#: ../../Zotlabs/Lib/NativeWiki.php:205
+#: ../../Zotlabs/Lib/NativeWiki.php:206
msgid "Wiki files deleted successfully"
msgstr "Wiki успешно удалена"
@@ -12596,7 +12623,7 @@ msgstr "Ваш аккаунт на %s перестанет работать че
#: ../../extend/addon/hzaddons/testdrive/testdrive.php:105
msgid "Your $Productname test account is about to expire."
-msgstr "Ваша пробная учётная запись в $Productname близка к окончанию срока действия."
+msgstr "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия."
#: ../../extend/addon/hzaddons/redfiles/redfiles.php:119
msgid "Redmatrix File Storage Import"
@@ -14132,7 +14159,7 @@ msgid ""
msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты."
#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:392
-#: ../../extend/addon/hzaddons/cart/manual_payments.php:38
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:68
#: ../../extend/addon/hzaddons/cart/cart.php:1462
msgid "Order not found."
msgstr "Заказ не найден."
@@ -14161,11 +14188,11 @@ msgstr "Недействительный элемент"
msgid "Error: order mismatch. Please try again."
msgstr "Ошибка: несоответствие заказа. Пожалуйста, попробуйте ещё раз"
-#: ../../extend/addon/hzaddons/cart/manual_payments.php:31
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:61
msgid "Manual payments are not enabled."
msgstr "Ручные платежи не подключены."
-#: ../../extend/addon/hzaddons/cart/manual_payments.php:47
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:77
msgid "Finished"
msgstr "Завершено"
@@ -14239,6 +14266,36 @@ msgstr "Разрешить федерацию публикаций по умол
msgid "NoFed Settings"
msgstr "Настройки NoFed"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:43
+msgid "Your channel has been upgraded to the latest $Projectname version."
+msgstr "Ваш канал был обновлён на последнюю версию $Projectname."
+
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:44
+msgid ""
+"To improve usability, we have converted some features into installable stand-"
+"alone apps."
+msgstr "Чтобы улучшить удобство использования, некоторые функции теперь доступны в виде устанавливаемых автономных приложений."
+
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:45
+msgid "Please visit the $Projectname"
+msgstr "Пожалуйста, посетите $Projectname"
+
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:46
+msgid "app store"
+msgstr "раздел \"Приложения\""
+
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:47
+msgid "and install possibly missing apps."
+msgstr "и установите необходимые вам."
+
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:52
+msgid "Upgrade Info"
+msgstr "Сведения об обновлении"
+
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:56
+msgid "Do not show this again"
+msgstr "Больше не показывать"
+
#: ../../extend/addon/hzaddons/gravatar/gravatar.php:123
msgid "generic profile image"
msgstr "Стандартное изображение профиля"
@@ -14465,11 +14522,11 @@ msgstr ""
#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:29
msgid "PHP post_max_size (must be larger than upload_max_filesize): "
-msgstr ""
+msgstr "PHP post_max_size (должен быть больше чем upload_max_filesize): "
#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:45
msgid "Flattr this!"
-msgstr ""
+msgstr "Flattr это!"
#: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:83
msgid "Flattr widget settings updated."
diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php
index 195f39bf2..598d02718 100644
--- a/view/ru/hstrings.php
+++ b/view/ru/hstrings.php
@@ -5,6 +5,7 @@ function string_plural_select_ru($n){
return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2));
}}
App::$rtl = 0;
+App::$strings["plural_function_code"] = "(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))";
App::$strings["Source channel not found."] = "Канал-источник не найден.";
App::$strings["Default"] = "По умолчанию";
App::$strings["Focus (Hubzilla default)"] = "Фокус (по умолчанию Hubzilla)";
@@ -16,7 +17,7 @@ App::$strings["Yes"] = "Да";
App::$strings["Navigation bar background color"] = "Панель навигации, цвет фона";
App::$strings["Navigation bar icon color "] = "Панель навигации, цвет значков";
App::$strings["Navigation bar active icon color "] = "Панель навигации, цвет активного значка";
-App::$strings["Link color"] = "цвет ссылок";
+App::$strings["Link color"] = "Цвет ссылок";
App::$strings["Set font-color for banner"] = "Цвет текста в шапке";
App::$strings["Set the background color"] = "Цвет фона";
App::$strings["Set the background image"] = "Фоновое изображение";
@@ -663,21 +664,41 @@ App::$strings["Thank you, this nickname is valid."] = "Спасибо, этот
App::$strings["A channel name is required."] = "Требуется название канала.";
App::$strings["This is a "] = "Это ";
App::$strings[" channel name"] = " название канала";
+App::$strings["%d minutes"] = array(
+ 0 => "%d минуту",
+ 1 => "%d минуты",
+ 2 => "%d минут",
+);
+App::$strings["about %d hours"] = array(
+ 0 => "около %d часa",
+ 1 => "около %d часов",
+ 2 => "около %d часов",
+);
+App::$strings["%d days"] = array(
+ 0 => "%d день",
+ 1 => "%d дня",
+ 2 => "%d дней",
+);
+App::$strings["%d months"] = array(
+ 0 => "%d месяц",
+ 1 => "%d месяца",
+ 2 => "%d месяцев",
+);
+App::$strings["%d years"] = array(
+ 0 => "%d год",
+ 1 => "%d года",
+ 2 => "%d лет",
+);
App::$strings["timeago.prefixAgo"] = "";
-App::$strings["timeago.prefixFromNow"] = "";
+App::$strings["timeago.prefixFromNow"] = "через";
App::$strings["timeago.suffixAgo"] = "назад";
App::$strings["timeago.suffixFromNow"] = "";
App::$strings["less than a minute"] = "менее чем одну минуту";
App::$strings["about a minute"] = "около минуты";
-App::$strings["%d minutes"] = "%d минут";
App::$strings["about an hour"] = "около часа";
-App::$strings["about %d hours"] = "около %d часов";
App::$strings["a day"] = "день";
-App::$strings["%d days"] = "%d дней";
App::$strings["about a month"] = "около месяца";
-App::$strings["%d months"] = "%d месяцев";
App::$strings["about a year"] = "около года";
-App::$strings["%d years"] = "%d лет";
App::$strings[" "] = " ";
App::$strings["timeago.numbers"] = "";
App::$strings["__ctx:long__ May"] = "Май";
@@ -1976,7 +1997,7 @@ App::$strings["This is displayed on the public server site list."] = "Это о
App::$strings["Register text"] = "Текст регистрации";
App::$strings["Will be displayed prominently on the registration page."] = "Будет отображаться на странице регистрации на видном месте.";
App::$strings["Site homepage to show visitors (default: login box)"] = "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа).";
-App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла.";
+App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла.";
App::$strings["Preserve site homepage URL"] = "Сохранить URL главной страницы сайта";
App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации";
App::$strings["Accounts abandoned after x days"] = "Аккаунты считаются заброшенными после N дней";
@@ -2538,6 +2559,9 @@ App::$strings["Communicate"] = "Связаться";
App::$strings["View your channel homepage"] = "Домашняя страница канала";
App::$strings["View your network stream"] = "Просмотреть ваш сетевой поток";
App::$strings["Documentation"] = "Документация";
+App::$strings["Missing Features?"] = "Отсутствует функция?";
+App::$strings["Pin apps to navigation bar"] = "Прикрепить приложение к панели";
+App::$strings["Install more apps"] = "Установить больше приложений";
App::$strings["View public stream"] = "Просмотреть публичный поток";
App::$strings["Private Mail Menu"] = "Меню личной переписки";
App::$strings["Combined View"] = "Комбинированный вид";
@@ -2596,12 +2620,12 @@ App::$strings["Delete conversation"] = "Удалить беседу";
App::$strings["__ctx:wiki_history__ Message"] = "Сообщение";
App::$strings["Date"] = "Дата";
App::$strings["Compare"] = "Сравнить";
-App::$strings["Can view my channel stream and posts"] = "Может просматривать мою ленту и сообщения";
+App::$strings["Can view my channel stream and posts"] = "Может просматривать мой поток и сообщения";
App::$strings["Can send me their channel stream and posts"] = "Может присылать мне свои потоки и сообщения";
App::$strings["Can view my default channel profile"] = "Может просматривать мой стандартный профиль канала";
App::$strings["Can view my connections"] = "Может просматривать мои контакты";
App::$strings["Can view my file storage and photos"] = "Может просматривать мое хранилище файлов";
-App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище";
+App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище";
App::$strings["Can view my channel webpages"] = "Может просматривать мои веб-страницы";
App::$strings["Can view my wiki pages"] = "Может просматривать мои вики-страницы";
App::$strings["Can create/edit my channel webpages"] = "Может редактировать мои веб-страницы";
@@ -2853,7 +2877,7 @@ App::$strings["Post to InsaneJournal by default"] = "Публиковать в I
App::$strings["InsaneJournal Post Settings"] = "Настройки публикаций в InsaneJournal";
App::$strings["Insane Journal Settings saved."] = "Настройки InsaneJournal сохранены.";
App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней.";
-App::$strings["Your $Productname test account is about to expire."] = "Ваша пробная учётная запись в $Productname близка к окончанию срока действия.";
+App::$strings["Your $Productname test account is about to expire."] = "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия.";
App::$strings["Redmatrix File Storage Import"] = "Импорт файлового хранилища Redmatrix";
App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Это позволит импортировать все ваши файлы в Redmatrix в этот канал.";
App::$strings["file"] = "файл";
@@ -3228,6 +3252,13 @@ App::$strings["nofed Settings saved."] = "Настройки nofed сохран
App::$strings["Allow Federation Toggle"] = "Разрешить переключение федерации";
App::$strings["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию";
App::$strings["NoFed Settings"] = "Настройки NoFed";
+App::$strings["Your channel has been upgraded to the latest \$Projectname version."] = "Ваш канал был обновлён на последнюю версию \$Projectname.";
+App::$strings["To improve usability, we have converted some features into installable stand-alone apps."] = "Чтобы улучшить удобство использования, некоторые функции теперь доступны в виде устанавливаемых автономных приложений.";
+App::$strings["Please visit the \$Projectname"] = "Пожалуйста, посетите \$Projectname";
+App::$strings["app store"] = "раздел \"Приложения\"";
+App::$strings["and install possibly missing apps."] = "и установите необходимые вам.";
+App::$strings["Upgrade Info"] = "Сведения об обновлении";
+App::$strings["Do not show this again"] = "Больше не показывать";
App::$strings["generic profile image"] = "Стандартное изображение профиля";
App::$strings["random geometric pattern"] = "Случайный геометрический рисунок";
App::$strings["monster face"] = "Лицо чудовища";
@@ -3281,8 +3312,8 @@ App::$strings["Friendica Login Password"] = "Пароль для входа Fire
App::$strings["Show Upload Limits"] = "Показать ограничения на загрузку";
App::$strings["Hubzilla configured maximum size: "] = "Максимальный размер настроенный в Hubzilla:";
App::$strings["PHP upload_max_filesize: "] = "";
-App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "";
-App::$strings["Flattr this!"] = "";
+App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (должен быть больше чем upload_max_filesize): ";
+App::$strings["Flattr this!"] = "Flattr это!";
App::$strings["Flattr widget settings updated."] = "Настройки виджета Flattr обновлены.";
App::$strings["Flattr user"] = "Пользователь Flattr";
App::$strings["URL of the Thing to flattr"] = "URL ccылки на Flattr";
diff --git a/view/theme/redbasic/schema/Focus-Light.css b/view/theme/redbasic/schema/Focus-Light.css
index d23fc0fd8..7289acffe 100644
--- a/view/theme/redbasic/schema/Focus-Light.css
+++ b/view/theme/redbasic/schema/Focus-Light.css
@@ -1,3 +1,4 @@
+.dropdown-header.text-white-50,
.navbar-dark .navbar-toggler,
.navbar-dark .nav-link.active {
color: rgba(0,0,0,0.7) !important;
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index dbee67c84..71f7bc393 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -152,6 +152,7 @@ option {
background-color: #111;
}
+.dropdown-header.text-black-50,
.nav-link.active {
color:#fff !important;
}
@@ -373,7 +374,7 @@ pre {
}
.dropdown-menu >li > a {
- color: #ccc;
+ color: #ccc !important;
}
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 01fc3f993..f7425ba98 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -34,7 +34,7 @@
'name_ok1' : "{{$name_ok1}}",
'name_ok2' : "{{$name_ok2}}",
-
+ 'plural_func' : "{{$plural_func}}",
't01' : "{{$t01}}",
't02' : "{{$t02}}",
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 0f6fad8e3..4a4db03eb 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -98,7 +98,7 @@
<script>
window.wiki_resource_id = '{{$resource_id}}';
- window.wiki_page_name = '{{$page}}';
+ window.wiki_page_name = '{{$page|escape:'javascript'}}';
window.wiki_page_content = '{{$content|escape:'javascript'}}';
window.wiki_page_commit = '{{$commit}}';
window.saved = true;
@@ -122,7 +122,7 @@
if (data.success) {
$('#rename-page-form-wrapper').hide();
window.console.log('data: ' + JSON.stringify(data));
- window.wiki_page_name = data.name.urlName;
+ window.wiki_page_name = data.name.htmlName;
$('#wiki-header-page').html(data.name.htmlName);
wiki_refresh_page_list();
} else {
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index d75f22f64..e11f3b145 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -7,7 +7,7 @@
{{foreach $pages as $page}}
<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
{{if $page.resource_id && $candel}}
- <i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.title}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
+ <i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title|escape:'javascript'}}', '{{$page.title|escape:'javascript'}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
{{/if}}
<a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
</li>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 801cb17fd..5f28d6b12 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -53,7 +53,7 @@
</td>
<td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
{{if $owner}}
- <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
+ <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title|escape:'javascript'}}', '{{$wiki.resource_id}}'); return false;"></i></td>
{{/if}}
</tr>
{{if $owner}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 15:10:43 +0000