diff options
| -rw-r--r-- | include/import.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | util/hmessages.po | 197 | ||||
| -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 | 114 | ||||
| -rw-r--r-- | view/es-es/hstrings.php | 7 | ||||
| -rw-r--r-- | view/nl/hmessages.po | 295 | ||||
| -rw-r--r-- | view/nl/hstrings.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 |
11 files changed, 277 insertions, 358 deletions
diff --git a/include/import.php b/include/import.php index 5c73b7ca3..e1880fe6e 100644 --- a/include/import.php +++ b/include/import.php @@ -138,6 +138,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 736712c81..9fa2f98a8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3804,7 +3804,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/hmessages.po b/util/hmessages.po index edbfd9a23..867d1f1ce 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -12038,144 +12038,16 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" -msgstr "" - -#: ../../include/js_strings.php:8 -#, php-format -msgid "%s show less" -msgstr "" - -#: ../../include/js_strings.php:9 -#, php-format -msgid "%s expand" -msgstr "" - -#: ../../include/js_strings.php:10 -#, php-format -msgid "%s collapse" -msgstr "" - -#: ../../include/js_strings.php:11 -msgid "Password too short" -msgstr "" - -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" -msgstr "" - -#: ../../include/js_strings.php:13 -msgid "everybody" -msgstr "" - -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" -msgstr "" - -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" -msgstr "" - -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." -msgstr "" - -#: ../../include/js_strings.php:17 -msgid "close all" -msgstr "" - -#: ../../include/js_strings.php:18 -msgid "Nothing new here" -msgstr "" - -#: ../../include/js_strings.php:19 -msgid "Rate This Channel (this is public)" -msgstr "" - -#: ../../include/js_strings.php:21 -msgid "Describe (optional)" -msgstr "" - -#: ../../include/js_strings.php:23 -msgid "Please enter a link URL" -msgstr "" - -#: ../../include/js_strings.php:24 -msgid "Unsaved changes. Are you sure you wish to leave this page?" -msgstr "" - -#: ../../include/js_strings.php:27 -msgid "timeago.prefixAgo" -msgstr "" - -#: ../../include/js_strings.php:28 -msgid "timeago.prefixFromNow" -msgstr "" - -#: ../../include/js_strings.php:29 -msgid "ago" -msgstr "" - -#: ../../include/js_strings.php:30 -msgid "from now" -msgstr "" - -#: ../../include/js_strings.php:31 -msgid "less than a minute" -msgstr "" - -#: ../../include/js_strings.php:32 -msgid "about a minute" -msgstr "" - -#: ../../include/js_strings.php:33 -#, php-format -msgid "%d minutes" -msgstr "" - -#: ../../include/js_strings.php:34 -msgid "about an hour" -msgstr "" - -#: ../../include/js_strings.php:35 -#, php-format -msgid "about %d hours" -msgstr "" - -#: ../../include/js_strings.php:36 -msgid "a day" -msgstr "" - -#: ../../include/js_strings.php:37 -#, php-format -msgid "%d days" -msgstr "" - -#: ../../include/js_strings.php:38 -msgid "about a month" -msgstr "" - -#: ../../include/js_strings.php:39 -#, php-format -msgid "%d months" -msgstr "" - -#: ../../include/js_strings.php:40 -msgid "about a year" -msgstr "" - -#: ../../include/js_strings.php:41 -#, php-format -msgid "%d years" +#: ../../include/selectors.php:123 +msgid "Partners" msgstr "" -#: ../../include/js_strings.php:42 -msgid " " +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Cohabiting" msgstr "" -#: ../../include/js_strings.php:43 -msgid "timeago.numbers" +#: ../../include/selectors.php:123 +msgid "Common law" msgstr "" #: ../../include/js_strings.php:45 ../../include/text.php:1325 @@ -12231,49 +12103,48 @@ msgstr "" msgid "Jan" msgstr "" -#: ../../include/js_strings.php:58 -msgid "Feb" +#: ../../include/selectors.php:123 +msgid "Swinger" msgstr "" -#: ../../include/js_strings.php:59 -msgid "Mar" +#: ../../include/selectors.php:123 +msgid "Betrayed" msgstr "" -#: ../../include/js_strings.php:60 -msgid "Apr" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Separated" msgstr "" -#: ../../include/js_strings.php:61 -msgctxt "short" -msgid "May" +#: ../../include/selectors.php:123 +msgid "Unstable" msgstr "" -#: ../../include/js_strings.php:62 -msgid "Jun" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Divorced" msgstr "" -#: ../../include/js_strings.php:63 -msgid "Jul" +#: ../../include/selectors.php:123 +msgid "Imaginarily divorced" msgstr "" -#: ../../include/js_strings.php:64 -msgid "Aug" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Widowed" msgstr "" -#: ../../include/js_strings.php:65 -msgid "Sep" +#: ../../include/selectors.php:123 +msgid "Uncertain" msgstr "" -#: ../../include/js_strings.php:66 -msgid "Oct" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "It's complicated" msgstr "" -#: ../../include/js_strings.php:67 -msgid "Nov" +#: ../../include/selectors.php:123 +msgid "Don't care" msgstr "" -#: ../../include/js_strings.php:68 -msgid "Dec" +#: ../../include/selectors.php:123 +msgid "Ask me" msgstr "" #: ../../include/js_strings.php:69 ../../include/text.php:1321 @@ -12308,16 +12179,16 @@ msgstr "" msgid "Sun" msgstr "" -#: ../../include/js_strings.php:77 -msgid "Mon" +#: ../../include/permissions.php:39 +msgid "Can view my webpages" msgstr "" -#: ../../include/js_strings.php:78 -msgid "Tue" +#: ../../include/permissions.php:43 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../include/js_strings.php:79 -msgid "Wed" +#: ../../include/permissions.php:46 +msgid "Can like/dislike stuff" msgstr "" #: ../../include/js_strings.php:80 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 83f17c820..49eb89ecc 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -38,13 +38,13 @@ 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; } -#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 be55236ba..a9d6e07e8 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -513,46 +513,76 @@ msgstr "Elemento no encontrado." msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana." -#: ../../Zotlabs/Module/Register.php:55 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado." +#: ../../Zotlabs/Module/Admin/Accounts.php:168 +#: ../../Zotlabs/Module/Admin/Channels.php:152 +msgid "select all" +msgstr "seleccionar todo" -#: ../../Zotlabs/Module/Register.php:89 -msgid "Passwords do not match." -msgstr "Las contraseñas no coinciden." +#: ../../Zotlabs/Module/Admin/Accounts.php:169 +msgid "Registrations waiting for confirm" +msgstr "Inscripciones en espera de confirmación" -#: ../../Zotlabs/Module/Register.php:131 -msgid "" -"Registration successful. Please check your email for validation " -"instructions." -msgstr "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo." +#: ../../Zotlabs/Module/Admin/Accounts.php:170 +msgid "Request date" +msgstr "Fecha de solicitud" + +#: ../../Zotlabs/Module/Admin/Accounts.php:170 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/network.php:2212 +msgid "Email" +msgstr "Correo electrónico" + +#: ../../Zotlabs/Module/Admin/Accounts.php:171 +msgid "No registrations." +msgstr "Sin registros." -#: ../../Zotlabs/Module/Register.php:137 -msgid "Your registration is pending approval by the site owner." -msgstr "Su registro está pendiente de aprobación por el propietario del sitio." +#: ../../Zotlabs/Module/Admin/Accounts.php:172 +#: ../../Zotlabs/Module/Connections.php:275 +msgid "Approve" +msgstr "Aprobar" -#: ../../Zotlabs/Module/Register.php:140 -msgid "Your registration can not be processed." -msgstr "Su registro no puede ser procesado." +#: ../../Zotlabs/Module/Admin/Accounts.php:173 +msgid "Deny" +msgstr "Rechazar" -#: ../../Zotlabs/Module/Register.php:184 -msgid "Registration on this hub is disabled." -msgstr "El registro está deshabilitado en este sitio." +#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Connedit.php:575 +msgid "Block" +msgstr "Bloquear" -#: ../../Zotlabs/Module/Register.php:193 -msgid "Registration on this hub is by approval only." -msgstr "El registro en este hub está sometido a aprobación previa." +#: ../../Zotlabs/Module/Admin/Accounts.php:176 +#: ../../Zotlabs/Module/Connedit.php:575 +msgid "Unblock" +msgstr "Desbloquear" -#: ../../Zotlabs/Module/Register.php:194 -msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" -msgstr "<a href=\"pubsites\">Registrarse en otro hub afiliado.</a>" +#: ../../Zotlabs/Module/Admin/Accounts.php:181 +msgid "ID" +msgstr "ID" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Admin/Accounts.php:183 ../../include/group.php:267 +msgid "All Channels" +msgstr "Todos los canales" + +#: ../../Zotlabs/Module/Admin/Accounts.php:184 +msgid "Register date" +msgstr "Fecha de registro" + +#: ../../Zotlabs/Module/Admin/Accounts.php:185 +msgid "Last login" +msgstr "Último acceso" + +#: ../../Zotlabs/Module/Admin/Accounts.php:186 +msgid "Expires" +msgstr "Caduca" + +#: ../../Zotlabs/Module/Admin/Accounts.php:187 +msgid "Service Class" +msgstr "Clase de servicio" + +#: ../../Zotlabs/Module/Admin/Accounts.php:189 msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana." +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted" +" on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "¡Las cuentas seleccionadas van a ser eliminadas!\\n\\n¡Todo lo que estas cuentas han publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?" #: ../../Zotlabs/Module/Register.php:221 ../../Zotlabs/Module/Siteinfo.php:27 msgid "Terms of Service" @@ -560,8 +590,10 @@ msgstr "Términos del servicio" #: ../../Zotlabs/Module/Register.php:227 #, php-format -msgid "I accept the %s for this website" -msgstr "Acepto los %s de este sitio" +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "%s canales censurados/no censurados" +msgstr[1] "%s canales censurados/no censurados" #: ../../Zotlabs/Module/Register.php:229 #, php-format @@ -602,10 +634,8 @@ msgstr "Elija un alias corto" #: ../../Zotlabs/Module/Register.php:239 #: ../../Zotlabs/Module/New_channel.php:136 #, php-format -msgid "" -"Your nickname will be used to create an easy to remember channel address " -"e.g. nickname%s" -msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s" +msgid "Channel '%s' code disallowed" +msgstr "Código no permitido al canal '%s'" #: ../../Zotlabs/Module/Register.php:240 #: ../../Zotlabs/Module/New_channel.php:137 @@ -646,9 +676,9 @@ msgstr "Registrarse" #: ../../Zotlabs/Module/Register.php:271 msgid "" -"This site may require email verification after submitting this form. If you " -"are returned to a login page, please check your email for instructions." -msgstr "Este sitio puede requerir una verificación de correo electrónico después de enviar este formulario. Si es devuelto a una página de inicio de sesión, compruebe su email para recibir y leer las instrucciones." +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Los canales seleccionados se eliminarán!\\n\\nTodo lo publicado por estos canales en este sitio se borrarán definitivamente!\\n\\n¿Está seguro de querer hacerlo?" #: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 #, php-format @@ -13531,6 +13561,10 @@ msgstr "No encontrado" msgid "Source channel not found." msgstr "No se ha encontrado el canal de origen." +#: ../../util/nconfig.php:34 +msgid "Source channel not found." +msgstr "No se ha encontrado el canal de origen." + #: ../../view/theme/redbasic/php/config.php:9 msgid "Focus (Hubzilla default)" msgstr "Focus (predefinido)" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index aa1e33c10..fa13899e5 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -441,7 +441,9 @@ App::$strings["Default"] = "Predeterminado"; 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"; @@ -456,6 +458,7 @@ App::$strings["Advanced - very comfortable"] = "Avanzado: muy cómodo"; App::$strings["Expert - I can write computer code"] = "Experto: puedo escribir código informático"; App::$strings["Wizard - I probably know more than you do"] = "Asistente: probablemente sé más que tú"; App::$strings["Site"] = "Sitio"; +App::$strings["Registration"] = "Registro"; App::$strings["File upload"] = "Subir fichero"; App::$strings["Policies"] = "Políticas"; App::$strings["Advanced"] = "Avanzado"; @@ -1171,10 +1174,7 @@ App::$strings["Authenticate"] = "Acceder"; App::$strings["Please login."] = "Por favor, inicie sesión."; App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña."; App::$strings["Remove This Account"] = "Eliminar esta cuenta"; -App::$strings["WARNING: "] = "ATENCIÓN:"; App::$strings["This account and all its channels will be completely removed from the network. "] = "Esta cuenta y todos sus canales van a ser eliminados de la red."; -App::$strings["This action is permanent and can not be undone!"] = "¡Esta acción tiene carácter definitivo y no se puede deshacer!"; -App::$strings["Please enter your password for verification:"] = "Por favor, introduzca su contraseña para su verificación:"; App::$strings["Remove this account, all its channels and all its channel clones from the network"] = "Remover esta cuenta, todos sus canales y clones de la red"; App::$strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Por defecto, solo las instancias de los canales ubicados en este servidor serán eliminados de la red"; App::$strings["Remove Account"] = "Eliminar cuenta"; @@ -1305,6 +1305,7 @@ App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %3\$s App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s ha dejado de seguir %3\$s de %2\$s"; 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"; +App::$strings["Channel Suggestions"] = "Sugerencias de canales"; App::$strings["post"] = "la entrada"; App::$strings["comment"] = "el comentario"; App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado %3\$s de %2\$s con %4\$s"; diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po index df00ee6b1..c24230de0 100644 --- a/view/nl/hmessages.po +++ b/view/nl/hmessages.po @@ -1601,60 +1601,54 @@ msgid "" "domains" msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten." -#: ../../Zotlabs/Module/Admin/Security.php:93 -msgid "Not allowed email domains" -msgstr "Niet toegestane e-maildomeinen" +#: ../../Zotlabs/Module/Dreport.php:97 +msgid "queued" +msgstr "in wachtrij" -#: ../../Zotlabs/Module/Admin/Security.php:93 -msgid "" -"Comma separated list of domains which are not allowed in email addresses for" -" registrations to this site. Wildcards are accepted. Empty to allow any " -"domains, unless allowed domains have been defined." -msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. " +#: ../../Zotlabs/Module/Dreport.php:101 +msgid "posted" +msgstr "verstuurd" -#: ../../Zotlabs/Module/Admin/Security.php:94 -msgid "Allow communications only from these sites" -msgstr "Alleen communicatie met deze hubs toestaan" +#: ../../Zotlabs/Module/Dreport.php:105 +msgid "accepted for delivery" +msgstr "geaccepteerd om afgeleverd te worden" -#: ../../Zotlabs/Module/Admin/Security.php:94 -msgid "" -"One site per line. Leave empty to allow communication from anywhere by " -"default" -msgstr "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan" +#: ../../Zotlabs/Module/Dreport.php:109 +msgid "updated" +msgstr "geüpdatet" -#: ../../Zotlabs/Module/Admin/Security.php:95 -msgid "Block communications from these sites" -msgstr "Communicatie met deze hubs blokkeren" +#: ../../Zotlabs/Module/Dreport.php:112 +msgid "update ignored" +msgstr "update genegeerd" -#: ../../Zotlabs/Module/Admin/Security.php:96 -msgid "Allow communications only from these channels" -msgstr "Sta alleen communicatie toe met deze kanalen" +#: ../../Zotlabs/Module/Dreport.php:115 +msgid "permission denied" +msgstr "toegang geweigerd" -#: ../../Zotlabs/Module/Admin/Security.php:96 -msgid "" -"One channel (hash) per line. Leave empty to allow from any channel by " -"default" -msgstr "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan" +#: ../../Zotlabs/Module/Dreport.php:119 +msgid "recipient not found" +msgstr "ontvanger niet gevonden" -#: ../../Zotlabs/Module/Admin/Security.php:97 -msgid "Block communications from these channels" -msgstr "Communicatie met deze kanalen blokkeren" +#: ../../Zotlabs/Module/Dreport.php:122 +msgid "mail recalled" +msgstr "Privébericht ingetrokken" -#: ../../Zotlabs/Module/Admin/Security.php:98 -msgid "Only allow embeds from secure (SSL) websites and links." -msgstr "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan." +#: ../../Zotlabs/Module/Dreport.php:125 +msgid "duplicate mail received" +msgstr "dubbel privébericht ontvangen" -#: ../../Zotlabs/Module/Admin/Security.php:99 -msgid "Allow unfiltered embedded HTML content only from these domains" -msgstr "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan" +#: ../../Zotlabs/Module/Dreport.php:128 +msgid "mail delivered" +msgstr "privébericht afgeleverd" -#: ../../Zotlabs/Module/Admin/Security.php:99 -msgid "One site per line. By default embedded content is filtered." -msgstr "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd." +#: ../../Zotlabs/Module/Dreport.php:148 +#, php-format +msgid "Delivery report for %1$s" +msgstr "Afleveringsrapport voor %1$s" -#: ../../Zotlabs/Module/Admin/Security.php:100 -msgid "Block embedded HTML from these domains" -msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren" +#: ../../Zotlabs/Module/Dreport.php:151 +msgid "Options" +msgstr "Opties" #: ../../Zotlabs/Module/Admin/Account_edit.php:29 #, php-format @@ -2711,27 +2705,30 @@ msgid "" " please import or restore these in date order (oldest first)." msgstr "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal <a href=\"%1$s\">%2$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen." -#: ../../Zotlabs/Module/Editlayout.php:127 -#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188 -msgid "Layout Name" -msgstr "Naam lay-out" +#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s niet leuk" #: ../../Zotlabs/Module/Editlayout.php:128 #: ../../Zotlabs/Module/Layouts.php:131 msgid "Layout Description (Optional)" msgstr "Lay-out-omschrijving (niet verplicht)" -#: ../../Zotlabs/Module/Editlayout.php:136 -msgid "Edit Layout" -msgstr "Lay-out bewerken" +#: ../../Zotlabs/Module/Like.php:425 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "%1$s is het niet eens met %2$s's %3$s" -#: ../../Zotlabs/Module/Editwebpage.php:142 -msgid "Page link" -msgstr "Paginalink" +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "%1$s onthoudt zich van een besluit over %2$s's %3$s" -#: ../../Zotlabs/Module/Editwebpage.php:169 -msgid "Edit Webpage" -msgstr "Webpagina bewerken" +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s is aanwezig op %2$s's %3$s" #: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178 msgid "Apps" @@ -2798,37 +2795,43 @@ msgstr "Niet in staat om menu aan te maken." msgid "Menu Name" msgstr "Menunaam" -#: ../../Zotlabs/Module/Menu.php:98 -msgid "Unique name (not visible on webpage) - required" -msgstr "Unieke naam vereist (niet zichtbaar op webpagina)" +#: ../../Zotlabs/Module/Like.php:539 +msgid "Thank you." +msgstr "Bedankt" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 -msgid "Menu Title" -msgstr "Menutitel" +#: ../../Zotlabs/Module/Profile_photo.php:186 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:293 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven." -#: ../../Zotlabs/Module/Menu.php:99 -msgid "Visible on webpage - leave empty for no title" -msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)" +#: ../../Zotlabs/Module/Profile_photo.php:409 +msgid "Use Photo for Profile" +msgstr "Als profielfoto gebruiken" -#: ../../Zotlabs/Module/Menu.php:100 -msgid "Allow Bookmarks" -msgstr "Bladwijzers toestaan" +#: ../../Zotlabs/Module/Profile_photo.php:409 +msgid "Upload Profile Photo" +msgstr "Profielfoto uploaden" -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -msgid "Menu may be used to store saved bookmarks" -msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan" +#: ../../Zotlabs/Module/Profile_photo.php:410 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:181 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:193 +msgid "Use" +msgstr "Gebruiken" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 -msgid "Submit and proceed" -msgstr "Opslaan en doorgaan" +#: ../../Zotlabs/Module/Search.php:223 +#, php-format +msgid "Items tagged with: %s" +msgstr "Items getagd met %s" #: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2289 msgid "Menus" msgstr "Menu's" -#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 -msgid "Drop" -msgstr "Verwijderen" +#: ../../Zotlabs/Module/Common.php:14 +msgid "No channel." +msgstr "Geen kanaal." #: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:255 #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 @@ -2842,62 +2845,63 @@ msgstr "Aangemaakt" msgid "Edited" msgstr "Bewerkt" -#: ../../Zotlabs/Module/Menu.php:117 -msgid "Bookmarks allowed" -msgstr "Bladwijzers toegestaan" +#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 +msgid "Authorize application connection" +msgstr "Geef toestemming voor applicatiekoppeling" -#: ../../Zotlabs/Module/Menu.php:119 -msgid "Delete this menu" -msgstr "Menu verwijderen" +#: ../../Zotlabs/Module/Api.php:73 +msgid "Return to your app and insert this Security Code:" +msgstr "Ga terug naar je app en voeg deze beveiligingscode in:" -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 -msgid "Edit menu contents" -msgstr "Bewerk de inhoud van het menu" +#: ../../Zotlabs/Module/Api.php:83 +msgid "Please login to continue." +msgstr "Inloggen om verder te kunnen gaan." -#: ../../Zotlabs/Module/Menu.php:121 -msgid "Edit this menu" -msgstr "Dit menu bewerken" +#: ../../Zotlabs/Module/Api.php:95 +msgid "" +"Do you want to authorize this application to access your posts and contacts," +" and/or create new posts for you?" +msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?" -#: ../../Zotlabs/Module/Menu.php:136 -msgid "Menu could not be deleted." -msgstr "Menu kon niet verwijderd worden." +#: ../../Zotlabs/Module/Ping.php:254 +msgid "sent you a private message" +msgstr "stuurde jou een privébericht" -#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28 -msgid "Menu not found." -msgstr "Menu niet gevonden." +#: ../../Zotlabs/Module/Ping.php:302 +msgid "added your channel" +msgstr "voegde jouw kanaal toe" -#: ../../Zotlabs/Module/Menu.php:149 -msgid "Edit Menu" -msgstr "Menu bewerken" +#: ../../Zotlabs/Module/Ping.php:312 +msgid "g A l F d" +msgstr "G:i, l d F" -#: ../../Zotlabs/Module/Menu.php:153 -msgid "Add or remove entries to this menu" -msgstr "Items aan dit menu toevoegen of verwijder" +#: ../../Zotlabs/Module/Ping.php:330 +msgid "[today]" +msgstr "[vandaag]" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Menu name" -msgstr "Naam van menu" +#: ../../Zotlabs/Module/Ping.php:339 +msgid "posted an event" +msgstr "plaatste een gebeurtenis" -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Must be unique, only seen by you" -msgstr "Moet uniek zijn en is alleen zichtbaar voor jou." +#: ../../Zotlabs/Module/Siteinfo.php:20 +msgid "About this site" +msgstr "Over deze hub" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title" -msgstr "Titel van menu" +#: ../../Zotlabs/Module/Siteinfo.php:21 +msgid "Site Name" +msgstr "Hubnaam" -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title as seen by others" -msgstr "Titel van menu zoals anderen dat zien." +#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1962 +msgid "Administrator" +msgstr "Beheerder" -#: ../../Zotlabs/Module/Menu.php:157 -msgid "Allow bookmarks" -msgstr "Bladwijzers toestaan" +#: ../../Zotlabs/Module/Siteinfo.php:28 +msgid "Software and Project information" +msgstr "Software- en projectinformatie" -#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 -#: ../../Zotlabs/Module/Xchan.php:41 -msgid "Not found." -msgstr "Niet gevonden." +#: ../../Zotlabs/Module/Siteinfo.php:29 +msgid "This site is powered by $Projectname" +msgstr "Dit is een $Projectname-hub" #: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:108 msgid "Edit post" @@ -2963,43 +2967,44 @@ msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de msgid "Public Hubs" msgstr "Openbare hubs" -#: ../../Zotlabs/Module/Pubsites.php:27 +#: ../../Zotlabs/Module/Lostpass.php:130 +msgid "Forgot your Password?" +msgstr "Wachtwoord vergeten?" + +#: ../../Zotlabs/Module/Lostpass.php:131 msgid "" -"The listed hubs allow public registration for the $Projectname network. All " -"hubs in the network are interlinked so membership on any of them conveys " -"membership in the network as a whole. Some hubs may require subscription or " -"provide tiered service plans. The hub itself <strong>may</strong> provide " -"additional details." -msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven." +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies." -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Hub URL" -msgstr "Hub-URL" +#: ../../Zotlabs/Module/Lostpass.php:132 +msgid "Email Address" +msgstr "E-mailadres" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Access Type" -msgstr "Toegangs-<br/> type" +#: ../../Zotlabs/Module/Lostpass.php:133 +msgid "Reset" +msgstr "Opnieuw instellen" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Registration Policy" -msgstr "Registratie-<br/> beleid" +#: ../../Zotlabs/Module/Rbmark.php:94 +msgid "Select a bookmark folder" +msgstr "Kies een bladwijzermap" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Stats" -msgstr "Stats" +#: ../../Zotlabs/Module/Rbmark.php:99 +msgid "Save Bookmark" +msgstr "Bladwijzer opslaan" -#: ../../Zotlabs/Module/Pubsites.php:33 -msgid "Software" -msgstr "Software" +#: ../../Zotlabs/Module/Rbmark.php:100 +msgid "URL of bookmark" +msgstr "URL van bladwijzer" #: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97 #: ../../include/conversation.php:941 ../../include/conversation.php:1099 msgid "Ratings" msgstr "Beoordelingen" -#: ../../Zotlabs/Module/Pubsites.php:48 -msgid "Rate" -msgstr "Beoordeel" +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" +msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig" #: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Events.php:694 #: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Blocks.php:166 diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index c221f6670..734ab7adb 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -867,6 +867,10 @@ App::$strings["layout"] = "lay-out"; App::$strings["menu"] = "menu"; App::$strings["%s element installed"] = "%s onderdeel geïnstalleerd"; App::$strings["%s element installation failed"] = "Installatie %s-element mislukt"; +App::$strings["Nothing to import."] = "Niets gevonden om te importeren"; +App::$strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; +App::$strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; +App::$strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter."; App::$strings["Import completed"] = "Importeren voltooid"; App::$strings["Import Items"] = "Importeer items"; App::$strings["Use this form to import existing posts and content from an export file."] = "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c632dbc74..1a38c7f01 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -9,6 +9,7 @@ /* generals */ html { font-size: 100%; + overflow-x: hidden; } body { |