From 027d9e211d101e437dff7555d8b084a613dff227 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 21 Nov 2019 20:00:57 -0800 Subject: [PATCH] more html5 br conversions --- Zotlabs/Lib/Enotify.php | 2 +- Zotlabs/Module/Admin/Security.php | 2 +- Zotlabs/Module/Directory.php | 2 +- Zotlabs/Module/Pdledit.php | 4 ++-- Zotlabs/Module/Pubsites.php | 2 +- Zotlabs/Module/Settings/Channel.php | 2 +- Zotlabs/Module/Viewsrc.php | 2 +- Zotlabs/Module/Zot_probe.php | 2 +- Zotlabs/Widget/Helpindex.php | 2 +- include/html2bbcode.php | 2 +- view/ca/messages.po | 16 ++++++++-------- view/ca/strings.php | 8 ++++---- view/de-de/messages.po | 18 +++++++++--------- view/de-de/strings.php | 10 +++++----- view/es-es/messages.po | 8 ++++---- view/es-es/strings.php | 2 +- view/fr/messages.po | 10 +++++----- view/fr/strings.php | 8 ++++---- view/he/messages.po | 4 ++-- view/he/strings.php | 2 +- view/it/messages.po | 10 +++++----- view/it/strings.php | 8 ++++---- view/js/main.js | 2 +- view/js/mod_directory.js | 2 +- view/nb-no/messages.po | 4 ++-- view/nb-no/strings.php | 2 +- view/nl/hmessages.po | 16 ++++++++-------- view/nl/hstrings.php | 8 ++++---- view/ru/messages.po | 14 +++++++------- view/ru/strings.php | 8 ++++---- view/tpl/admin_profiles.tpl | 6 +++--- view/tpl/cover_photo.tpl | 6 +++--- view/tpl/lang_selector.tpl | 2 +- view/tpl/mood_content.tpl | 12 ++++++------ view/tpl/pdledit.tpl | 10 +++++----- view/tpl/poke_content.tpl | 4 ++-- view/tpl/profile_advanced.tpl | 2 +- view/tpl/profile_photo.tpl | 6 +++--- view/tpl/rating_form.tpl | 2 +- view/tpl/register.tpl | 2 +- view/tpl/sources_edit.tpl | 4 ++-- 41 files changed, 119 insertions(+), 119 deletions(-) diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index f7ee488fd..1f78682a6 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -613,7 +613,7 @@ class Enotify { $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))),ENT_QUOTES,'UTF-8')); - $htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
\n"),$body))); + $htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
\n"),$body))); // use $_SESSION['zid_override'] to force zid() to use diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php index 3390874a1..d5563a773 100644 --- a/Zotlabs/Module/Admin/Security.php +++ b/Zotlabs/Module/Admin/Security.php @@ -120,7 +120,7 @@ class Security { } $embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:"); - $embedhelp3 = t("https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"); + $embedhelp3 = t("https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"); $embedhelp4 = t("All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."); $t = get_markup_template('admin_security.tpl'); diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 3a448f48d..36e98084a 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -267,7 +267,7 @@ class Directory extends Controller { $profile_link = chanlink_url($rr['url']); - $pdesc = (($rr['description']) ? $rr['description'] . '
' : ''); + $pdesc = (($rr['description']) ? $rr['description'] . '
' : ''); $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); // Checking status is disabled ATM until someone checks the performance impact more carefully diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php index 638a4c2d8..f7b176de5 100644 --- a/Zotlabs/Module/Pdledit.php +++ b/Zotlabs/Module/Pdledit.php @@ -66,7 +66,7 @@ class Pdledit extends \Zotlabs\Web\Controller { $name = lcfirst(basename($f,'.php')); $x = theme_include('mod_' . $name . '.pdl'); if($x) { - $o .= '' . $name . '' . ((in_array($name,$edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '': '' ) . '
'; + $o .= '' . $name . '' . ((in_array($name,$edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '': '' ) . '
'; } } } @@ -74,7 +74,7 @@ class Pdledit extends \Zotlabs\Web\Controller { if($addons) { foreach($addons as $a) { $name = substr(basename($a, '.pdl'),4); - $o .= '' . $name . '' . ((in_array($name,$edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '': '' ) . '
'; + $o .= '' . $name . '' . ((in_array($name,$edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '': '' ) . '
'; } } diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php index 7fa4a6a43..ce3b0502b 100644 --- a/Zotlabs/Module/Pubsites.php +++ b/Zotlabs/Module/Pubsites.php @@ -56,7 +56,7 @@ class Pubsites extends \Zotlabs\Web\Controller { $location = '

' . $jj['location'] . '

'; } else { - $location = '
 '; + $location = '
 '; } $urltext = str_replace(array('https://'), '', $jj['url']); $o .= ' ' . $urltext . '' . $location . '' . $jj['access'] . '' . $jj['register'] . '' . ucwords($jj['project']) . (($jj['version']) ? ' ' . $jj['version'] : '') . ''; diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 3b53c6981..4ddb11fc4 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -449,7 +449,7 @@ class Channel { )); - $subdir = ((strlen(App::get_path())) ? '
' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); + $subdir = ((strlen(App::get_path())) ? '
' . t('or') . ' ' . z_root() . '/channel/' . $nickname : ''); $webbie = $nickname . '@' . App::get_hostname(); $intl_nickname = unpunify($nickname) . '@' . unpunify(App::get_hostname()); diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php index 615faa36b..e7e6b8685 100644 --- a/Zotlabs/Module/Viewsrc.php +++ b/Zotlabs/Module/Viewsrc.php @@ -48,7 +48,7 @@ class Viewsrc extends Controller { } $content = escape_tags($r[0]['body']); - $o = (($json) ? json_encode($content) : str_replace("\n",'
',$content)); + $o = (($json) ? json_encode($content) : str_replace("\n",'
',$content)); } } diff --git a/Zotlabs/Module/Zot_probe.php b/Zotlabs/Module/Zot_probe.php index 7569e32f9..28d457238 100644 --- a/Zotlabs/Module/Zot_probe.php +++ b/Zotlabs/Module/Zot_probe.php @@ -17,7 +17,7 @@ class Zot_probe extends \Zotlabs\Web\Controller { $o .= 'Lookup URI:
'; $o .= ''; - $o .= '

'; + $o .= '

'; if(x($_GET,'addr')) { $addr = $_GET['addr']; diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php index 761b5900d..5b406b87e 100644 --- a/Zotlabs/Widget/Helpindex.php +++ b/Zotlabs/Widget/Helpindex.php @@ -44,7 +44,7 @@ class Helpindex { $o .= $level_0; if($levels) { foreach($levels as $l) { - $o .= '

'; + $o .= '

'; $o .= $l; } } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index b880447c7..99a1b732c 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -142,7 +142,7 @@ function html2bbcode($message) $node->nodeValue = str_replace("\n", "\r", $node->nodeValue); $message = $doc->saveHTML(); - $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); + $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); $message = preg_replace('= [\s]*=i', " ", $message); @$doc->loadHTML($message); diff --git a/view/ca/messages.po b/view/ca/messages.po index e7bbc980b..117269ce8 100644 --- a/view/ca/messages.po +++ b/view/ca/messages.po @@ -3327,9 +3327,9 @@ msgstr "L'ajust recomanat és només permetre HTML sense filtrar dels següents #: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" -msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" #: ../../Zotlabs/Module/Admin/Security.php:88 msgid "" @@ -11195,9 +11195,9 @@ msgstr "Publica a GNU Social" #: ../../addon/statusnet/statusnet.php:195 msgid "" -"Please contact your site administrator.
The provided API URL is not " +"Please contact your site administrator.
The provided API URL is not " "valid." -msgstr "Contacta l'administrador del teu lloc.
L'adreça URL de l'API no és vàlida." +msgstr "Contacta l'administrador del teu lloc.
L'adreça URL de l'API no és vàlida." #: ../../addon/statusnet/statusnet.php:232 msgid "We could not contact the GNU social API with the Path you entered." @@ -11216,7 +11216,7 @@ msgid "" "There are preconfigured OAuth key pairs for some GNU social servers " "available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)." -msgstr "Hi ha disponibles preconfigurats alguns parells de clau OAuth per a alguns servidors de GNU Social. I en fas servir algun, fes servir aquestes credencials.
Altrament, pots connectar-te a qualsevol altra instància de GNU Social (mira més avall)" +msgstr "Hi ha disponibles preconfigurats alguns parells de clau OAuth per a alguns servidors de GNU Social. I en fas servir algun, fes servir aquestes credencials.
Altrament, pots connectar-te a qualsevol altra instància de GNU Social (mira més avall)" #: ../../addon/statusnet/statusnet.php:327 msgid "Provide your own OAuth Credentials" @@ -11226,10 +11226,10 @@ msgstr "Proporciona credencials OAuth pròpies" msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as" " an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " +"here and enter the API base root.
Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." -msgstr "No s'ha trobat cap parell de claus per a GNU Social. Registra el teu compte de Hubzilla com un client d'escriptori al teu compte de GNU Social, després copia el parell de claus de consumidor aquí i finalment introdueix l'adreça arrel de l'API.
Abans de registrar el teu propi parell de claus, pregunta a l'administració d'aquest hub si ja hi ha un parell de claus registrat per al mateix servidor de GNU Social." +msgstr "No s'ha trobat cap parell de claus per a GNU Social. Registra el teu compte de Hubzilla com un client d'escriptori al teu compte de GNU Social, després copia el parell de claus de consumidor aquí i finalment introdueix l'adreça arrel de l'API.
Abans de registrar el teu propi parell de claus, pregunta a l'administració d'aquest hub si ja hi ha un parell de claus registrat per al mateix servidor de GNU Social." #: ../../addon/statusnet/statusnet.php:333 msgid "OAuth Consumer Key" diff --git a/view/ca/strings.php b/view/ca/strings.php index d2954b2b7..410be06a1 100644 --- a/view/ca/strings.php +++ b/view/ca/strings.php @@ -656,7 +656,7 @@ App::$strings["Account language (for emails)"] = "Idioma pel compte (pels correu App::$strings["Service class"] = "Classe de servei"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Per defecte, HTML no filtrat està permés als media embeguts. Això es inherentment no segur."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "L'ajust recomanat és només permetre HTML sense filtrar dels següents llocs:"; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Tota la resta de contingut embegut seà filtrat, excepte contingut embegut d'aquest lloc que està blocat explícitament."; App::$strings["Security"] = "Seguretat"; App::$strings["Block public"] = "Bloca que sigui públic"; @@ -2465,13 +2465,13 @@ App::$strings["right"] = "dreta"; App::$strings["Enable Flattr widget"] = "Habilita el giny de Flattr"; App::$strings["Flattr Widget Settings"] = "Opcions del giny de Flattr"; App::$strings["Post to GNU social"] = "Publica a GNU Social"; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Contacta l'administrador del teu lloc.
L'adreça URL de l'API no és vàlida."; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Contacta l'administrador del teu lloc.
L'adreça URL de l'API no és vàlida."; App::$strings["We could not contact the GNU social API with the Path you entered."] = "No s'ha trobat una API de GNU Social a la ruta introduïda."; App::$strings["GNU social settings updated."] = "S'ha actualitzat la configuració de GNU Social "; App::$strings["Globally Available GNU social OAuthKeys"] = "Claus OAuth de GNU Social diponibles públicament"; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Hi ha disponibles preconfigurats alguns parells de clau OAuth per a alguns servidors de GNU Social. I en fas servir algun, fes servir aquestes credencials.
Altrament, pots connectar-te a qualsevol altra instància de GNU Social (mira més avall)"; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Hi ha disponibles preconfigurats alguns parells de clau OAuth per a alguns servidors de GNU Social. I en fas servir algun, fes servir aquestes credencials.
Altrament, pots connectar-te a qualsevol altra instància de GNU Social (mira més avall)"; App::$strings["Provide your own OAuth Credentials"] = "Proporciona credencials OAuth pròpies"; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "No s'ha trobat cap parell de claus per a GNU Social. Registra el teu compte de Hubzilla com un client d'escriptori al teu compte de GNU Social, després copia el parell de claus de consumidor aquí i finalment introdueix l'adreça arrel de l'API.
Abans de registrar el teu propi parell de claus, pregunta a l'administració d'aquest hub si ja hi ha un parell de claus registrat per al mateix servidor de GNU Social."; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "No s'ha trobat cap parell de claus per a GNU Social. Registra el teu compte de Hubzilla com un client d'escriptori al teu compte de GNU Social, després copia el parell de claus de consumidor aquí i finalment introdueix l'adreça arrel de l'API.
Abans de registrar el teu propi parell de claus, pregunta a l'administració d'aquest hub si ja hi ha un parell de claus registrat per al mateix servidor de GNU Social."; App::$strings["OAuth Consumer Key"] = "Clau de consumidor OAuth"; App::$strings["OAuth Consumer Secret"] = "Secret de consumidor OAuth"; App::$strings["Base API Path"] = "Ruta arrel de l'API"; diff --git a/view/de-de/messages.po b/view/de-de/messages.po index 8af9dce6b..205d5062a 100644 --- a/view/de-de/messages.po +++ b/view/de-de/messages.po @@ -3275,9 +3275,9 @@ msgstr "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolge #: ../../Zotlabs/Module/Admin/Security.php:81 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" -msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" #: ../../Zotlabs/Module/Admin/Security.php:82 msgid "" @@ -10938,9 +10938,9 @@ msgstr "Bei GNU social veröffentlichen" #: ../../addon/statusnet/statusnet.php:195 msgid "" -"Please contact your site administrator.
The provided API URL is not " +"Please contact your site administrator.
The provided API URL is not " "valid." -msgstr "Bitte kontaktiere den Administrator deines Hubs.
Die angegebene API URL ist nicht korrekt." +msgstr "Bitte kontaktiere den Administrator deines Hubs.
Die angegebene API URL ist nicht korrekt." #: ../../addon/statusnet/statusnet.php:232 msgid "We could not contact the GNU social API with the Path you entered." @@ -10959,7 +10959,7 @@ msgid "" "There are preconfigured OAuth key pairs for some GNU social servers " "available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)." -msgstr "Für einige GNU social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel.
Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen GNU social Server her (siehe unten)." +msgstr "Für einige GNU social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel.
Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen GNU social Server her (siehe unten)." #: ../../addon/statusnet/statusnet.php:327 msgid "Provide your own OAuth Credentials" @@ -10969,10 +10969,10 @@ msgstr "Stelle deine eigenen OAuth Credentials zur Verfügung" msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as" " an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " +"here and enter the API base root.
Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." -msgstr "Kein Consumer-Schlüsselpaar für GNU social gefunden. Registriere deinen Hubzilla-Account als Desktop-Client bei deinem GNU social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Hubzilla-Servers, ob schon ein Schlüsselpaar für diesen Hubzilla-Server auf diesem GNU social-Server existiert." +msgstr "Kein Consumer-Schlüsselpaar für GNU social gefunden. Registriere deinen Hubzilla-Account als Desktop-Client bei deinem GNU social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Hubzilla-Servers, ob schon ein Schlüsselpaar für diesen Hubzilla-Server auf diesem GNU social-Server existiert." #: ../../addon/statusnet/statusnet.php:333 msgid "OAuth Consumer Key" @@ -13530,7 +13530,7 @@ msgstr "Nicht anzeigen" msgid "" "Post permissions %s cannot be changed %s after a post is shared.
These" " permissions set who is allowed to view the post." -msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.
Diese Berechtigungen bestimmen, wer den Beitrag sehen kann." +msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.
Diese Berechtigungen bestimmen, wer den Beitrag sehen kann." #: ../../include/dba/dba_driver.php:178 #, php-format diff --git a/view/de-de/strings.php b/view/de-de/strings.php index 884267319..d83bf6ab5 100644 --- a/view/de-de/strings.php +++ b/view/de-de/strings.php @@ -647,7 +647,7 @@ App::$strings["Account language (for emails)"] = "Kontosprache (für E-Mails)"; App::$strings["Service class"] = "Dienstklasse"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:"; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Alle anderen eingebetteten Inhalte werden gefiltert, es sei denn, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert."; App::$strings["Security"] = "Sicherheit"; App::$strings["Block public"] = "Öffentlichen Zugriff blockieren"; @@ -2412,13 +2412,13 @@ App::$strings["right"] = "rechts"; App::$strings["Enable Flattr widget"] = "Flattr Widget verwenden"; App::$strings["Flattr Widget Settings"] = "Flattr Widget Einstellungen"; App::$strings["Post to GNU social"] = "Bei GNU social veröffentlichen"; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bitte kontaktiere den Administrator deines Hubs.
Die angegebene API URL ist nicht korrekt."; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bitte kontaktiere den Administrator deines Hubs.
Die angegebene API URL ist nicht korrekt."; App::$strings["We could not contact the GNU social API with the Path you entered."] = "Mit dem angegebenen Pfad war es uns nicht möglich, die GNU social API zu erreichen."; App::$strings["GNU social settings updated."] = "GNU social Einstellungen aktualisiert."; App::$strings["Globally Available GNU social OAuthKeys"] = "Global verfügbare GNU social OAuthKeys"; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Für einige GNU social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel.
Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen GNU social Server her (siehe unten)."; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Für einige GNU social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel.
Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen GNU social Server her (siehe unten)."; App::$strings["Provide your own OAuth Credentials"] = "Stelle deine eigenen OAuth Credentials zur Verfügung"; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Kein Consumer-Schlüsselpaar für GNU social gefunden. Registriere deinen Hubzilla-Account als Desktop-Client bei deinem GNU social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Hubzilla-Servers, ob schon ein Schlüsselpaar für diesen Hubzilla-Server auf diesem GNU social-Server existiert."; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Kein Consumer-Schlüsselpaar für GNU social gefunden. Registriere deinen Hubzilla-Account als Desktop-Client bei deinem GNU social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Hubzilla-Servers, ob schon ein Schlüsselpaar für diesen Hubzilla-Server auf diesem GNU social-Server existiert."; App::$strings["OAuth Consumer Key"] = "OAuth Consumer Key"; App::$strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; App::$strings["Base API Path"] = "Basis Pfad der API"; @@ -3051,7 +3051,7 @@ App::$strings["Custom selection"] = "Benutzerdefinierte Auswahl"; App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen."; App::$strings["Show"] = "Anzeigen"; App::$strings["Don't show"] = "Nicht anzeigen"; -App::$strings["Post permissions %s cannot be changed %s after a post is shared.
These permissions set who is allowed to view the post."] = "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.
Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."; +App::$strings["Post permissions %s cannot be changed %s after a post is shared.
These permissions set who is allowed to view the post."] = "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.
Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."; App::$strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"; App::$strings["Image/photo"] = "Bild/Foto"; App::$strings["Encrypted content"] = "Verschlüsselter Inhalt"; diff --git a/view/es-es/messages.po b/view/es-es/messages.po index ca40cc870..9899d9377 100644 --- a/view/es-es/messages.po +++ b/view/es-es/messages.po @@ -2316,11 +2316,11 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Security.php:117 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" msgstr "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" #: ../../Zotlabs/Module/Admin/Security.php:118 msgid "" diff --git a/view/es-es/strings.php b/view/es-es/strings.php index 2002c863a..4a722ecd0 100644 --- a/view/es-es/strings.php +++ b/view/es-es/strings.php @@ -462,7 +462,7 @@ App::$strings["Account language (for emails)"] = "Idioma de la cuenta (para los App::$strings["Service class"] = "Clase de servicio"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "De forma predeterminada, el HTML sin filtrar está permitido en el contenido multimedia incorporado en una publicación. Esto es siempre inseguro."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "La configuración recomendada es que sólo se permita HTML sin filtrar desde los siguientes sitios: "; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "El resto del contenido incrustado se filtrará, excepto si el contenido incorporado desde ese sitio está bloqueado de forma explícita."; App::$strings["Security"] = "Seguridad"; App::$strings["Block public"] = "Bloquear páginas públicas"; diff --git a/view/fr/messages.po b/view/fr/messages.po index c5263c2df..e7b682e19 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -3262,9 +3262,9 @@ msgstr "Ce paramétrage autorisant le HTML pour les sites suivants." #: ../../Zotlabs/Module/Admin/Security.php:81 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" -msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" #: ../../Zotlabs/Module/Admin/Security.php:82 msgid "" @@ -10925,7 +10925,7 @@ msgstr "Publier sur GNU-social" #: ../../addon/statusnet/statusnet.php:195 msgid "" -"Please contact your site administrator.
The provided API URL is not " +"Please contact your site administrator.
The provided API URL is not " "valid." msgstr "Veuillez contacter l'administrateur de votre site. L'URL de l'API n'est pas valide." @@ -10956,7 +10956,7 @@ msgstr "Fournissez vos propres informations d'identification OAuth" msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as" " an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " +"here and enter the API base root.
Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." msgstr "Aucune paire de clés utilisateur n'a été trouvée pour GNU-social. Enregistrer votre compte Hubzilla en tant que client de bureau sur votre compte GNU-social, puis copier la paire de clés utilisateur ici et entrer la racine de base de l'API.\nAvant d'enregistrer votre propre paire de clés OAuth, demandez à l'administrateur s'il existe déjà une paire de clés pour cette installation de Hubzilla à votre installation GNU-social préférée." diff --git a/view/fr/strings.php b/view/fr/strings.php index cdf233584..7dd2cb6fb 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -647,7 +647,7 @@ App::$strings["Account language (for emails)"] = "Langue de votre compte (pour e App::$strings["Service class"] = "Classe de service"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Par défaut le code HTML est autorisé pour les média par exemple les vidéos embarquées. Cependant cela peut poser un faille de sécurité."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Ce paramétrage autorisant le HTML pour les sites suivants."; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Les contenus html seront filtrés sauf ceux des sites explicitement bloqués."; App::$strings["Security"] = "Sécurité"; App::$strings["Block public"] = "Bloquer \"public\""; @@ -2412,13 +2412,13 @@ App::$strings["right"] = "droite"; App::$strings["Enable Flattr widget"] = "Activer le widget Flattr"; App::$strings["Flattr Widget Settings"] = "Paramètres du widget Flattr"; App::$strings["Post to GNU social"] = "Publier sur GNU-social"; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Veuillez contacter l'administrateur de votre site. L'URL de l'API n'est pas valide."; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Veuillez contacter l'administrateur de votre site. L'URL de l'API n'est pas valide."; App::$strings["We could not contact the GNU social API with the Path you entered."] = "Nous ne pouvons pas contacter l'API de GNU-social avec le chemin que vous avez entré."; App::$strings["GNU social settings updated."] = "Les paramètres GNU-social ont été mis à jour."; App::$strings["Globally Available GNU social OAuthKeys"] = "Les OAuthKeys GNU-social sont globalement disponibles."; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Il existe des paires de clés OAuth préconfigurées pour certains serveurs GNU-social disponibles. Si vous utilisez l'un d'eux, utilisez ces informations d'identification.\nSi vous ne voulez pas vous connecter à une autre instance GNU social (voir ci-dessous)."; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Il existe des paires de clés OAuth préconfigurées pour certains serveurs GNU-social disponibles. Si vous utilisez l'un d'eux, utilisez ces informations d'identification.\nSi vous ne voulez pas vous connecter à une autre instance GNU social (voir ci-dessous)."; App::$strings["Provide your own OAuth Credentials"] = "Fournissez vos propres informations d'identification OAuth"; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Aucune paire de clés utilisateur n'a été trouvée pour GNU-social. Enregistrer votre compte Hubzilla en tant que client de bureau sur votre compte GNU-social, puis copier la paire de clés utilisateur ici et entrer la racine de base de l'API.\nAvant d'enregistrer votre propre paire de clés OAuth, demandez à l'administrateur s'il existe déjà une paire de clés pour cette installation de Hubzilla à votre installation GNU-social préférée."; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Aucune paire de clés utilisateur n'a été trouvée pour GNU-social. Enregistrer votre compte Hubzilla en tant que client de bureau sur votre compte GNU-social, puis copier la paire de clés utilisateur ici et entrer la racine de base de l'API.\nAvant d'enregistrer votre propre paire de clés OAuth, demandez à l'administrateur s'il existe déjà une paire de clés pour cette installation de Hubzilla à votre installation GNU-social préférée."; App::$strings["OAuth Consumer Key"] = "Clé d'utilisateur OAuth"; App::$strings["OAuth Consumer Secret"] = "Secret d'utilisateur OAuth"; App::$strings["Base API Path"] = "Chemin de l'API de base"; diff --git a/view/he/messages.po b/view/he/messages.po index 991b7f64f..4d98b8133 100644 --- a/view/he/messages.po +++ b/view/he/messages.po @@ -4047,8 +4047,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin.php:750 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" msgstr "" #: ../../Zotlabs/Module/Admin.php:751 diff --git a/view/he/strings.php b/view/he/strings.php index d20cb9a6e..38fe52ac5 100644 --- a/view/he/strings.php +++ b/view/he/strings.php @@ -891,7 +891,7 @@ App::$strings["on server"] = "בשרת"; App::$strings["Server"] = "שרת"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = ""; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = ""; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = ""; App::$strings["Security"] = "אבטחה"; App::$strings["Block public"] = ""; diff --git a/view/it/messages.po b/view/it/messages.po index fc4772846..a04d6cefa 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -3248,9 +3248,9 @@ msgstr "L'impostazione consigliata è di permettere HTML non filtrato solo dai s #: ../../Zotlabs/Module/Admin/Security.php:81 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" -msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" #: ../../Zotlabs/Module/Admin/Security.php:82 msgid "" @@ -10626,7 +10626,7 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:195 msgid "" -"Please contact your site administrator.
The provided API URL is not " +"Please contact your site administrator.
The provided API URL is not " "valid." msgstr "" @@ -10657,7 +10657,7 @@ msgstr "" msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as" " an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " +"here and enter the API base root.
Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." msgstr "" diff --git a/view/it/strings.php b/view/it/strings.php index 42fc58347..a20dfed2a 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -646,7 +646,7 @@ App::$strings["Account language (for emails)"] = "Lingua (per le email di sistem App::$strings["Service class"] = "Classe dell'account"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Il codice HTML degli oggetti multimediali incorporati nei post è consentito. Questo tipo di impostazione è insicura."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "L'impostazione consigliata è di permettere HTML non filtrato solo dai seguenti siti:"; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Tutti gli altri contenuti incorporati saranno filtrati a meno che il contenuto incorporato di quel sito non sia esplicitamente bloccato."; App::$strings["Security"] = "Sicurezza"; App::$strings["Block public"] = "Blocca pagine pubbliche"; @@ -2346,13 +2346,13 @@ App::$strings["right"] = ""; App::$strings["Enable Flattr widget"] = ""; App::$strings["Flattr Widget Settings"] = ""; App::$strings["Post to GNU social"] = ""; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = ""; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = ""; App::$strings["We could not contact the GNU social API with the Path you entered."] = ""; App::$strings["GNU social settings updated."] = ""; App::$strings["Globally Available GNU social OAuthKeys"] = ""; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = ""; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = ""; App::$strings["Provide your own OAuth Credentials"] = ""; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = ""; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = ""; App::$strings["OAuth Consumer Key"] = ""; App::$strings["OAuth Consumer Secret"] = ""; App::$strings["Base API Path"] = ""; diff --git a/view/js/main.js b/view/js/main.js index 4b1c8b9f6..9739331f4 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1581,7 +1581,7 @@ function b2h(s) { rep(/\>/gi,">"); rep(/\"/gi,"""); - rep(/\n/gi,"
"); + rep(/\n/gi,"
"); rep(/\[b\]/gi,""); rep(/\[\/b\]/gi,""); rep(/\[i\]/gi,""); diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index e850963c1..26aff9210 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -23,7 +23,7 @@ function doRatings(hash) { } function buildRatingForm(hash) { - var html = '
' + aStr.rating_desc + '
' + aStr.rating_text + '
'; + var html = '
' + aStr.rating_desc + '
' + aStr.rating_text + '
'; $.colorbox({maxwidth: "50%", maxHeight: "50%", scrolling: false, html: html, close: 'X' }); currentHash = hash; diff --git a/view/nb-no/messages.po b/view/nb-no/messages.po index bcb926d90..877f5941c 100644 --- a/view/nb-no/messages.po +++ b/view/nb-no/messages.po @@ -4041,8 +4041,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin.php:750 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" msgstr "" #: ../../Zotlabs/Module/Admin.php:751 diff --git a/view/nb-no/strings.php b/view/nb-no/strings.php index e03ba321d..e4dcff9dd 100644 --- a/view/nb-no/strings.php +++ b/view/nb-no/strings.php @@ -891,7 +891,7 @@ App::$strings["on server"] = "på tjener"; App::$strings["Server"] = "Tjener"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = ""; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = ""; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = ""; App::$strings["Security"] = "Sikkerhet"; App::$strings["Block public"] = "Blokker offentlig tilgang"; diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po index c98121122..c9cb18bc1 100644 --- a/view/nl/hmessages.po +++ b/view/nl/hmessages.po @@ -3258,9 +3258,9 @@ msgstr "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende website #: ../../Zotlabs/Module/Admin/Security.php:81 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" -msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +msgstr "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
" #: ../../Zotlabs/Module/Admin/Security.php:82 msgid "" @@ -10921,9 +10921,9 @@ msgstr "GNU social" #: ../../addon/statusnet/statusnet.php:195 msgid "" -"Please contact your site administrator.
The provided API URL is not " +"Please contact your site administrator.
The provided API URL is not " "valid." -msgstr "De verstrekte API-URL is ongeldig.
Neem contact op met jouw hubbeheerder." +msgstr "De verstrekte API-URL is ongeldig.
Neem contact op met jouw hubbeheerder." #: ../../addon/statusnet/statusnet.php:232 msgid "We could not contact the GNU social API with the Path you entered." @@ -10942,7 +10942,7 @@ msgid "" "There are preconfigured OAuth key pairs for some GNU social servers " "available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)." -msgstr "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)." +msgstr "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)." #: ../../addon/statusnet/statusnet.php:327 msgid "Provide your own OAuth Credentials" @@ -10952,10 +10952,10 @@ msgstr "Verstrek jouw eigen OAuth-gegevens" msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as" " an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " +"here and enter the API base root.
Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." -msgstr "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat." +msgstr "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat." #: ../../addon/statusnet/statusnet.php:333 msgid "OAuth Consumer Key" diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index 3581950aa..9e56c315f 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -647,7 +647,7 @@ App::$strings["Account language (for emails)"] = "Taal van account (voor e-mails App::$strings["Service class"] = "Abonnement"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:"; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = "https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "Alle andere ingesloten (embedded) inhoud wordt gefilterd, tenzij ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd."; App::$strings["Security"] = "Beveiliging"; App::$strings["Block public"] = "Openbare toegang blokkeren"; @@ -2412,13 +2412,13 @@ App::$strings["right"] = "rechts"; App::$strings["Enable Flattr widget"] = "Flattrwidget inschakelen"; App::$strings["Flattr Widget Settings"] = "Flattrwidget"; App::$strings["Post to GNU social"] = "GNU social"; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "De verstrekte API-URL is ongeldig.
Neem contact op met jouw hubbeheerder."; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "De verstrekte API-URL is ongeldig.
Neem contact op met jouw hubbeheerder."; App::$strings["We could not contact the GNU social API with the Path you entered."] = "Wij konden de GNU social-API niet bereiken door middel van het ingevulde pad."; App::$strings["GNU social settings updated."] = "GNU social-instellingen bijgewerkt."; App::$strings["Globally Available GNU social OAuthKeys"] = "Op de gehele hub te gebruiken GNU social OAuthkeys."; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)."; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Er zijn op deze hub enkele voorgeconfigureerde OAuthkey-paren voor GNU social servers beschikbaar. Wanneer je een van deze servers gebruikt, gebruik dan deze voorgeconfigureerde gegevens.
Wanneer dit niet het geval is, maak dan gerust met een andere GNU social-server verbinding (zie hieronder)."; App::$strings["Provide your own OAuth Credentials"] = "Verstrek jouw eigen OAuth-gegevens"; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat."; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Geen consumerkey voor GNU social gevonden. Registreer jouw Hubzilla-account als een desktopclient in jouw GNU-social-account, kopieer en plak hier de consumerkey en de consumersecret, en vul de API-base-root in.
Voordat je jouw eigen OAuthkey-paar registreert, vraag dan eerst aan jouw hubbeheerder of er al een key-paar voor deze hub op jouw favoriete GNU social-server bestaat."; App::$strings["OAuth Consumer Key"] = "OAuth-consumerkey"; App::$strings["OAuth Consumer Secret"] = "Oauth-consumersecret"; App::$strings["Base API Path"] = "Basispad API"; diff --git a/view/ru/messages.po b/view/ru/messages.po index b04bf742f..4e092f409 100644 --- a/view/ru/messages.po +++ b/view/ru/messages.po @@ -2359,9 +2359,9 @@ msgstr "Опубликовать в GNU Social" #: ../../extend/addon/hzaddons/statusnet/statusnet.php:195 msgid "" -"Please contact your site administrator.
The provided API URL is not " +"Please contact your site administrator.
The provided API URL is not " "valid." -msgstr "Пожалуйста свяжитесь с администратором сайта.
Предоставленный URL API недействителен." +msgstr "Пожалуйста свяжитесь с администратором сайта.
Предоставленный URL API недействителен." #: ../../extend/addon/hzaddons/statusnet/statusnet.php:232 msgid "We could not contact the GNU social API with the Path you entered." @@ -2380,7 +2380,7 @@ msgid "" "There are preconfigured OAuth key pairs for some GNU social servers " "available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)." -msgstr "Существуют предварительно настроенные пары ключей OAuth для некоторых доступных серверов GNU social. Если вы используете один из них, используйте эти учетные данные.
Если вы не хотите подключаться к какому-либо другому серверу GNU social (см. ниже)." +msgstr "Существуют предварительно настроенные пары ключей OAuth для некоторых доступных серверов GNU social. Если вы используете один из них, используйте эти учетные данные.
Если вы не хотите подключаться к какому-либо другому серверу GNU social (см. ниже)." #: ../../extend/addon/hzaddons/statusnet/statusnet.php:327 msgid "Provide your own OAuth Credentials" @@ -2390,10 +2390,10 @@ msgstr "Предоставьте ваши собственные регистр msgid "" "No consumer key pair for GNU social found. Register your Hubzilla Account as " "an desktop client on your GNU social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " +"here and enter the API base root.
Before you register your own OAuth " "key pair ask the administrator if there is already a key pair for this " "Hubzilla installation at your favourite GNU social installation." -msgstr "Не найдена пользовательская пара ключей для GNU social. Зарегистрируйте свою учетную запись Hubzilla в качестве настольного клиента в своей учетной записи GNU social, скопируйте cюда пару ключей пользователя и введите корневой каталог базы API.
Прежде чем регистрировать свою собственную пару ключей OAuth, спросите администратора, если ли уже пара ключей для этой установки Hubzilla в вашем GNU social." +msgstr "Не найдена пользовательская пара ключей для GNU social. Зарегистрируйте свою учетную запись Hubzilla в качестве настольного клиента в своей учетной записи GNU social, скопируйте cюда пару ключей пользователя и введите корневой каталог базы API.
Прежде чем регистрировать свою собственную пару ключей OAuth, спросите администратора, если ли уже пара ключей для этой установки Hubzilla в вашем GNU social." #: ../../extend/addon/hzaddons/statusnet/statusnet.php:333 msgid "OAuth Consumer Key" @@ -12007,8 +12007,8 @@ msgstr "Рекомендуется настроить разрешения ис #: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/" -"
https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/" +"
https://vimeo.com/
https://soundcloud.com/
" msgstr "" #: ../../Zotlabs/Module/Admin/Security.php:88 diff --git a/view/ru/strings.php b/view/ru/strings.php index b37c85888..4f5425071 100644 --- a/view/ru/strings.php +++ b/view/ru/strings.php @@ -449,13 +449,13 @@ App::$strings["Friendica login name"] = "Имя входа Friendica"; App::$strings["Friendica password"] = "Пароль Friendica"; App::$strings["Hubzilla to Friendica Post Settings"] = "Настройки публикаций Hubzilla для Friendica"; App::$strings["Post to GNU social"] = "Опубликовать в GNU Social"; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Пожалуйста свяжитесь с администратором сайта.
Предоставленный URL API недействителен."; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Пожалуйста свяжитесь с администратором сайта.
Предоставленный URL API недействителен."; App::$strings["We could not contact the GNU social API with the Path you entered."] = "Нам не удалось установить контакт с GNU Social API по введённому вами пути"; App::$strings["GNU social settings updated."] = "Настройки GNU Social обновлены."; App::$strings["Globally Available GNU social OAuthKeys"] = "Глобально доступные ключи OAuthKeys GNU Social"; -App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Существуют предварительно настроенные пары ключей OAuth для некоторых доступных серверов GNU social. Если вы используете один из них, используйте эти учетные данные.
Если вы не хотите подключаться к какому-либо другому серверу GNU social (см. ниже)."; +App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.
If not feel free to connect to any other GNU social instance (see below)."] = "Существуют предварительно настроенные пары ключей OAuth для некоторых доступных серверов GNU social. Если вы используете один из них, используйте эти учетные данные.
Если вы не хотите подключаться к какому-либо другому серверу GNU social (см. ниже)."; App::$strings["Provide your own OAuth Credentials"] = "Предоставьте ваши собственные регистрационные данные OAuth"; -App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Не найдена пользовательская пара ключей для GNU social. Зарегистрируйте свою учетную запись Hubzilla в качестве настольного клиента в своей учетной записи GNU social, скопируйте cюда пару ключей пользователя и введите корневой каталог базы API.
Прежде чем регистрировать свою собственную пару ключей OAuth, спросите администратора, если ли уже пара ключей для этой установки Hubzilla в вашем GNU social."; +App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "Не найдена пользовательская пара ключей для GNU social. Зарегистрируйте свою учетную запись Hubzilla в качестве настольного клиента в своей учетной записи GNU social, скопируйте cюда пару ключей пользователя и введите корневой каталог базы API.
Прежде чем регистрировать свою собственную пару ключей OAuth, спросите администратора, если ли уже пара ключей для этой установки Hubzilla в вашем GNU social."; App::$strings["OAuth Consumer Key"] = "Ключ клиента OAuth"; App::$strings["OAuth Consumer Secret"] = "Пароль клиента OAuth"; App::$strings["Base API Path"] = "Основной путь к API"; @@ -2699,7 +2699,7 @@ App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"; App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно."; App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:"; -App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; +App::$strings["https://youtube.com/
https://www.youtube.com/
https://youtu.be/
https://vimeo.com/
https://soundcloud.com/
"] = ""; App::$strings["All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."] = "се остальные встроенные материалы будут отфильтрованы, если встроенное содержимое с этого сайта явно заблокировано."; App::$strings["Block public"] = "Блокировать публичный доступ"; App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Установите флажок для блокировки публичного доступа ко всем другим общедоступным страницам на этом сайте, если вы в настоящее время не аутентифицированы."; diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl index e3a08449c..fa35b46ae 100644 --- a/view/tpl/admin_profiles.tpl +++ b/view/tpl/admin_profiles.tpl @@ -6,7 +6,7 @@
{{$all_desc}} -

+

{{$all}}
@@ -22,9 +22,9 @@ {{if $cust_fields}} -

+

{{$cust_field_desc}}
-
+
{{foreach $cust_fields as $field}} diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index e77cd7116..df3e15a76 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -108,15 +108,15 @@
-
-
+
+
-
+
-
-
+
+
{{$drop}}