aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/comanche.php55
-rwxr-xr-xinclude/diaspora.php2
-rw-r--r--include/menu.php27
-rw-r--r--include/nav.php2
-rw-r--r--mod/mitem.php22
-rw-r--r--util/messages.po106
-rw-r--r--version.inc2
-rw-r--r--view/css/bootstrap-red.css11
-rw-r--r--view/css/widgets.css4
-rw-r--r--view/de/htconfig.tpl2
-rw-r--r--view/de/messages.po86
-rw-r--r--view/de/strings.php44
-rw-r--r--view/de/update_fail_eml.tpl2
-rw-r--r--view/nl/messages.po425
-rw-r--r--view/nl/strings.php28
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/tpl/menuedit.tpl1
-rw-r--r--view/tpl/mitemedit.tpl7
-rw-r--r--view/tpl/usermenu.tpl13
19 files changed, 486 insertions, 357 deletions
diff --git a/include/comanche.php b/include/comanche.php
index 7115b5635..f385f3c5a 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -101,11 +101,22 @@ function comanche_parser(&$a, $s, $pass = 0) {
}
-function comanche_menu($name, $class = '') {
+function comanche_menu($s, $class = '') {
+
$channel_id = comanche_get_channel_id();
+ $name = $s;
+
+ $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $var[$mtch[1]] = $mtch[2];
+ $name = str_replace($mtch[0], '', $name);
+ }
+ }
+
if($channel_id) {
$m = menu_fetch($name,$channel_id, get_observer_hash());
- return menu_render($m, $class);
+ return menu_render($m, $class, $edit = false, $var);
}
}
@@ -168,6 +179,33 @@ function comanche_block($s, $class = '') {
return $o;
}
+function comanche_js($s) {
+
+ switch($s) {
+ case 'jquery':
+ $path = 'view/js/jquery.js';
+ break;
+ case 'bootstrap':
+ $path = 'library/bootstrap/js/bootstrap.min.js';
+ break;
+ }
+
+ return '<script src="' . z_root() . '/' . $path . '" ></script>';
+
+}
+
+function comanche_css($s) {
+
+ switch($s) {
+ case 'bootstrap':
+ $path = 'library/bootstrap/css/bootstrap.min.css';
+ break;
+ }
+
+ return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">';
+
+}
+
// This doesn't really belong in Comanche, but it could also be argued that it is the perfect place.
// We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content.
// For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps
@@ -246,6 +284,19 @@ function comanche_region(&$a, $s) {
}
}
+ $cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],comanche_js(trim($mtch[1])),$s);
+ }
+ }
+
+ $cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER);
+ if($cnt) {
+ foreach($matches as $mtch) {
+ $s = str_replace($mtch[0],comanche_css(trim($mtch[1])),$s);
+ }
+ }
// need to modify this to accept parameters
$cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
diff --git a/include/diaspora.php b/include/diaspora.php
index acdddd0ef..c9efffc32 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2430,7 +2430,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
if($item['item_flags'] & ITEM_CONSENSUS) {
$poll = replace_macros(get_markup_template('diaspora_consensus.tpl'), array(
'$guid_q' => random_string(),
- '$question' => '',
+ '$question' => t('Please choose'),
'$guid_y' => random_string(),
'$agree' => t('Agree'),
'$guid_n' => random_string(),
diff --git a/include/menu.php b/include/menu.php
index b4f4555a5..5c0811437 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -24,26 +24,47 @@ function menu_fetch($name,$uid,$observer_xchan) {
return null;
}
-function menu_render($menu, $class='', $edit = false) {
+function menu_render($menu, $class='', $edit = false, $var = '') {
if(! $menu)
return '';
+ $channel_id = ((is_array(get_app()->profile)) ? get_app()->profile['profile_uid'] : 0);
+ $menu_list = menu_list($channel_id);
+
+ foreach($menu_list as $menus) {
+ if($menus['menu_name'] != $menu['menu']['menu_name'])
+ $menu_names[] = $menus['menu_name'];
+ }
+
for($x = 0; $x < count($menu['items']); $x ++) {
+ if(in_array($menu['items'][$x]['mitem_link'], $menu_names)) {
+ $m = menu_fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash());
+ $submenu = menu_render($m, 'dropdown-menu', $edit = false, $var = array('wrap' => 'none'));
+ $menu['items'][$x]['submenu'] = $submenu;
+ }
+
if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID)
$menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']);
+
if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN)
$menu['items'][$x]['newwin'] = '1';
+
$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
}
- return replace_macros(get_markup_template('usermenu.tpl'),array(
+ $wrap = (($var['wrap'] === 'none') ? false : true);
+
+ $ret = replace_macros(get_markup_template('usermenu.tpl'),array(
'$menu' => $menu['menu'],
'$class' => $class,
'$edit' => (($edit) ? t("Edit") : ''),
'$id' => $menu['menu']['menu_id'],
- '$items' => $menu['items']
+ '$items' => $menu['items'],
+ '$wrap' => $wrap
));
+
+ return $ret;
}
diff --git a/include/nav.php b/include/nav.php
index 1134d1b48..77287c021 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -124,7 +124,7 @@ EOT;
if($observer) {
$userinfo = array(
- 'icon' => $observer['xchan_photo_s'],
+ 'icon' => $observer['xchan_photo_m'],
'name' => $observer['xchan_addr'],
);
}
diff --git a/mod/mitem.php b/mod/mitem.php
index 6235987a6..a95487e37 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -124,6 +124,13 @@ function mitem_content(&$a) {
$m = menu_fetch($a->data['menu']['menu_name'],$uid,$ob_hash);
$a->data['menu_item'] = $m;
+ $menu_list = menu_list($uid);
+
+ foreach($menu_list as $menus) {
+ if($menus['menu_name'] != $m['menu']['menu_name'])
+ $menu_names[] = $menus['menu_name'];
+ }
+
$perm_defaults = array(
'allow_cid' => $channel['channel_allow_cid'],
'allow_gid' => $channel['channel_allow_gid'],
@@ -152,14 +159,15 @@ function mitem_content(&$a) {
'$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults,false),
'$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'),
- '$mitem_link' => array('mitem_link', t('Link Target'), '', 'URL of the link', '*'),
- '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), true, ''),
+ '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
+ '$usezid' => array('usezid', t('Use magic-auth if available'), true, ''),
'$newwin' => array('newwin', t('Open link in new window'), false,''),
'$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Submit and finish'),
'$submit_more' => t('Submit and continue'),
'$display' => $display,
- '$lockstate' => $lockstate
+ '$lockstate' => $lockstate,
+ '$menu_names' => $menu_names
));
$o .= replace_macros(get_markup_template('mitemlist.tpl'),array(
@@ -222,12 +230,18 @@ function mitem_content(&$a) {
'$aclselect' => populate_acl($mitem,false),
'$mitem_id' => intval(argv(2)),
'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
+<<<<<<< HEAD
'$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'),
'$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
+=======
+ '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
+ '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
+>>>>>>> 2cb8b19972eb6a023eca1297f281ef9f68934c64
'$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''),
'$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Submit'),
- '$lockstate' => $lockstate
+ '$lockstate' => $lockstate,
+ '$menu_names' => $menu_names
));
return $o;
diff --git a/util/messages.po b/util/messages.po
index 9a3a96adf..095dda543 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-05-01.1019\n"
+"Project-Id-Version: 2015-05-08.1026\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-01 00:03-0700\n"
+"POT-Creation-Date: 2015-05-08 00:03-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2336,49 +2336,6 @@ msgstr ""
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:743
-#: ../../include/bbcode.php:746 ../../include/bbcode.php:751
-#: ../../include/bbcode.php:754 ../../include/bbcode.php:757
-#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
-#: ../../include/bbcode.php:768 ../../include/bbcode.php:773
-#: ../../include/bbcode.php:776 ../../include/bbcode.php:779
-#: ../../include/bbcode.php:782
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:793
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:177
-msgid "Install design element: "
-msgstr ""
-
-#: ../../include/bbcode.php:190
-msgid "QR code"
-msgstr ""
-
-#: ../../include/bbcode.php:241
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:243
-msgid "post"
-msgstr ""
-
-#: ../../include/bbcode.php:493
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:704
-msgid "$1 spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:731
-msgid "$1 wrote:"
-msgstr ""
-
#: ../../include/items.php:399 ../../mod/like.php:270
#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
#: ../../mod/bulksetclose.php:11 ../../index.php:392
@@ -3104,6 +3061,49 @@ msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:743
+#: ../../include/bbcode.php:746 ../../include/bbcode.php:751
+#: ../../include/bbcode.php:754 ../../include/bbcode.php:757
+#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
+#: ../../include/bbcode.php:768 ../../include/bbcode.php:773
+#: ../../include/bbcode.php:776 ../../include/bbcode.php:779
+#: ../../include/bbcode.php:782
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:793
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:177
+msgid "Install design element: "
+msgstr ""
+
+#: ../../include/bbcode.php:190
+msgid "QR code"
+msgstr ""
+
+#: ../../include/bbcode.php:241
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:243
+msgid "post"
+msgstr ""
+
+#: ../../include/bbcode.php:493
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../include/bbcode.php:704
+msgid "$1 spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:731
+msgid "$1 wrote:"
+msgstr ""
+
#: ../../include/photos.php:94
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
@@ -3847,6 +3847,22 @@ msgstr ""
msgid "Room is full"
msgstr ""
+#: ../../include/diaspora.php:2433
+msgid "Please choose"
+msgstr ""
+
+#: ../../include/diaspora.php:2435
+msgid "Agree"
+msgstr ""
+
+#: ../../include/diaspora.php:2437
+msgid "Disagree"
+msgstr ""
+
+#: ../../include/diaspora.php:2439
+msgid "Abstain"
+msgstr ""
+
#: ../../mod/achievements.php:34
msgid "Some blurb about what to do when you're new here"
msgstr ""
diff --git a/version.inc b/version.inc
index 438fb54f0..387119390 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-05.1023
+2015-05-10.1028
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index ffc288962..c6d99e7ae 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -26,12 +26,12 @@ nav i {
}
nav ul li {
- max-height: 49px;
+ max-height: 50px;
}
nav img {
- height: 48px;
- width: 48px;
+ height: 49px;
+ width: 49px;
margin-top: 1px;
}
@@ -56,6 +56,11 @@ nav .navbar-toggle {
/* nav overrides end */
+
+aside .nav-pills > li > a {
+ padding: 6px 10px;
+}
+
.dropdown-menu img {
float: left;
width: 32px;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 566dd2b8a..0a901b1f9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -7,10 +7,6 @@
margin-top: 0px;
}
-.widget .nav-pills > li > a {
- padding: 6px 10px;
-}
-
.widget-input {
width: 100%;
border-top-right-radius: 0px;
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 928694769..550b018fe 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Hubzilla";
+$a->config['system']['sitename'] = "Red Matrix";
$a->config['system']['location_hash'] = '{{$site_id}}';
diff --git a/view/de/messages.po b/view/de/messages.po
index 506a6a4fa..ef27fd162 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -1,5 +1,5 @@
-# Hubzilla Project
-# Copyright (C) 2012-2014 the Hubzilla Project
+# Red Matrix Project
+# Copyright (C) 2012-2014 the Red Matrix Project
# This file is distributed under the same license as the Red package.
#
# Translators:
@@ -24,7 +24,7 @@
# sasiflo <transiflex@sasiflo.de>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Hubzilla\n"
+"Project-Id-Version: Red Matrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-20 00:04-0800\n"
"PO-Revision-Date: 2015-02-27 09:55+0000\n"
@@ -394,12 +394,12 @@ msgid "Public Hubs"
msgstr "Öffentliche Hubs"
#: ../../include/enotify.php:41
-msgid "Hubzilla Notification"
-msgstr "Hubzilla Benachrichtigung"
+msgid "Red Matrix Notification"
+msgstr "Red Matrix Benachrichtigung"
#: ../../include/enotify.php:42
-msgid "hubzilla"
-msgstr "hubzilla"
+msgid "redmatrix"
+msgstr "redmatrix"
#: ../../include/enotify.php:44
msgid "Thank You,"
@@ -2069,8 +2069,8 @@ msgid "l F d, Y \\@ g:i A"
msgstr "l, d. F Y, H:i"
#: ../../include/bb2diaspora.php:430
-msgid "Hubzilla event notification:"
-msgstr "Hubzilla Termin-Benachrichtigung:"
+msgid "Redmatrix event notification:"
+msgstr "RedMatrix Termin-Benachrichtigung:"
#: ../../include/bb2diaspora.php:434 ../../include/event.php:20
msgid "Starts:"
@@ -2656,7 +2656,7 @@ msgstr "Nur für Dich sichtbar."
#: ../../include/items.php:1185
msgid "Visible to anybody in this network."
-msgstr "Für jedes Mitglied der Hubzilla sichtbar."
+msgstr "Für jedes Mitglied der RedMatrix sichtbar."
#: ../../include/items.php:1187
msgid "Visible to anybody authenticated."
@@ -4313,8 +4313,8 @@ msgid "Currently pending"
msgstr "Derzeit anstehend"
#: ../../mod/home.php:48
-msgid "Hubzilla - &quot;The Network&quot;"
-msgstr "Hubzilla – &quot;Das Netzwerk&quot;"
+msgid "Red Matrix - &quot;The Network&quot;"
+msgstr "RedMatrix – &quot;Das Netzwerk&quot;"
#: ../../mod/home.php:101
#, php-format
@@ -4386,8 +4386,8 @@ msgid "Fetching URL returns error: %1$s"
msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
#: ../../mod/dav.php:121
-msgid "Hubzilla channel"
-msgstr "Hubzilla-Kanal"
+msgid "RedMatrix channel"
+msgstr "RedMatrix-Kanal"
#: ../../mod/profile_photo.php:108
msgid "Image uploaded but image cropping failed."
@@ -4611,7 +4611,7 @@ msgstr "Öffentliche Server"
#: ../../mod/pubsites.php:19
msgid ""
-"The listed sites allow public registration into the Hubzilla. All sites in"
+"The listed sites allow public registration into the Red Matrix. All sites in"
" the matrix are interlinked so membership on any of them conveys membership "
"in the matrix as a whole. Some sites may require subscription or provide "
"tiered service plans. The provider links <strong>may</strong> provide "
@@ -5225,8 +5225,8 @@ msgid "Remove this channel"
msgstr "Diesen Kanal löschen"
#: ../../mod/cloud.php:120
-msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
-msgstr "Hubzilla – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++"
+msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+msgstr "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++"
#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
msgid "Tag removed"
@@ -5311,9 +5311,9 @@ msgstr "Red"
#: ../../mod/siteinfo.php:137
msgid ""
-"This is a hub of the Hubzilla - a global cooperative network of "
+"This is a hub of the Red Matrix - a global cooperative network of "
"decentralized privacy enhanced websites."
-msgstr "Dieser Hub ist Teil der Hubzilla – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
+msgstr "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
#: ../../mod/siteinfo.php:139
msgid "Tag: "
@@ -5329,9 +5329,9 @@ msgstr "Erreichbar unter der Web-Adresse"
#: ../../mod/siteinfo.php:145
msgid ""
-"Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more"
-" about the Hubzilla."
-msgstr "Bitte besuchen Sie <a href=\"https://redmatrix.me\">Redmatrix.me</a>, um mehr über Hubzilla zu erfahren."
+"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more"
+" about the Red Matrix."
+msgstr "Bitte besuchen Sie <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren."
#: ../../mod/siteinfo.php:146
msgid "Bug reports and issues: please visit"
@@ -5339,9 +5339,9 @@ msgstr "Probleme oder Fehler gefunden? Bitte besuche"
#: ../../mod/siteinfo.php:149
msgid ""
-"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
"com"
-msgstr "Vorschläge, Lob, usw.: E-Mail an 'hubzilla' at librelist - dot - com"
+msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
#: ../../mod/siteinfo.php:151
msgid "Site Administrators"
@@ -5356,8 +5356,8 @@ msgid "Not Found"
msgstr "Nicht gefunden"
#: ../../mod/setup.php:166
-msgid "Hubzilla Server - Setup"
-msgstr "Hubzilla Server - Installation"
+msgid "Red Matrix Server - Setup"
+msgstr "Red Matrix Server - Installation"
#: ../../mod/setup.php:172
msgid "Could not connect to database."
@@ -5401,7 +5401,7 @@ msgstr "Datenbank Verbindung"
#: ../../mod/setup.php:290
msgid ""
-"In order to install Hubzilla we need to know how to connect to your "
+"In order to install Red Matrix we need to know how to connect to your "
"database."
msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
@@ -6341,20 +6341,20 @@ msgid "Your message:"
msgstr "Deine Nachricht:"
#: ../../mod/invite.php:132
-msgid "Please join my community on Hubzilla."
-msgstr "Schließe Dich uns in der Hubzilla an!"
+msgid "Please join my community on RedMatrix."
+msgstr "Schließe Dich uns in der RedMatrix an!"
#: ../../mod/invite.php:134
msgid "You will need to supply this invitation code: "
msgstr "Gib folgenden Einladungs-Code ein:"
#: ../../mod/invite.php:135
-msgid "1. Register at any Hubzilla location (they are all inter-connected)"
-msgstr "1. Registriere Dich auf irgendeinem Hubzilla-Server (sie sind alle miteinander verbunden)"
+msgid "1. Register at any RedMatrix location (they are all inter-connected)"
+msgstr "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)"
#: ../../mod/invite.php:137
-msgid "2. Enter my Hubzilla network address into the site searchbar."
-msgstr "2. Gib meine Hubzilla-Adresse im Suchfeld ein."
+msgid "2. Enter my RedMatrix network address into the site searchbar."
+msgstr "2. Gib meine RedMatrix-Adresse im Suchfeld ein."
#: ../../mod/invite.php:138
msgid "or visit "
@@ -7360,7 +7360,7 @@ msgstr "Den „Entdecken“-Reiter ausblenden"
msgid ""
"Remove the tab in the network view with public content pulled from sources "
"chosen for this site."
-msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen Hubzilla-Hubs geholt wurden."
+msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen RedMatrix-Hubs geholt wurden."
#: ../../mod/admin.php:445
msgid "No login on Homepage"
@@ -7785,7 +7785,7 @@ msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk
msgid ""
"By default only the instances of the channels located on this hub will be "
"removed from the network"
-msgstr "Standardmäßig werden nur die Kanalklone auf diesem Hubzilla-Hub aus dem Netzwerk entfernt"
+msgstr "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt"
#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
@@ -7898,8 +7898,8 @@ msgid "URL of link"
msgstr "URL des Links"
#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
-msgid "Use Hubzilla magic-auth if available"
-msgstr "Verwende die automatische Hubzilla-Authentifizierung (magic-auth), wenn verfügbar"
+msgid "Use RedMatrix magic-auth if available"
+msgstr "Verwende die automatische RedMatrix-Authentifizierung (magic-auth), wenn verfügbar"
#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
msgid "Open link in new window"
@@ -7989,9 +7989,9 @@ msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
#: ../../mod/like.php:21
msgid ""
-"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a "
-"href=\"register\">register as a new Redmatrix.member</a> to continue."
-msgstr "Bitte <a href=\"rmagic\">melde Dich mit Deiner Hubzilla-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der Hubzilla</a>, um fortzufahren."
+"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a "
+"href=\"register\">register as a new RedMatrix member</a> to continue."
+msgstr "Bitte <a href=\"rmagic\">melde Dich mit Deiner RedMatrix-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der RedMatrix</a>, um fortzufahren."
#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
msgid "Invalid request."
@@ -8606,8 +8606,8 @@ msgid "Right offset of the aside element"
msgstr "Rechter Rand des Aside-Elements"
#: ../../view/theme/redbasic/php/config.php:84
-msgid "Light (Hubzilla default)"
-msgstr "Hell (Hubzilla-Voreinstellung)"
+msgid "Light (Red Matrix default)"
+msgstr "Hell (RedMatrix-Voreinstellung)"
#: ../../view/theme/redbasic/php/config.php:104
msgid "Narrow navbar"
@@ -8741,7 +8741,7 @@ msgstr "Aktualisierungsfehler auf %s"
#: ../../boot.php:1527
msgid ""
-"Create an account to access services and applications within the Hubzilla"
+"Create an account to access services and applications within the Red Matrix"
msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."
#: ../../boot.php:1555
diff --git a/view/de/strings.php b/view/de/strings.php
index e90419ec8..2679e9eb1 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -76,8 +76,8 @@ $a->strings["photo/image"] = "Foto/Bild";
$a->strings["Rate Me"] = "Bewerte mich";
$a->strings["View Ratings"] = "Bewertungen ansehen";
$a->strings["Public Hubs"] = "Öffentliche Hubs";
-$a->strings["Hubzilla Notification"] = "Hubzilla Benachrichtigung";
-$a->strings["hubzilla"] = "hubzilla";
+$a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung";
+$a->strings["redmatrix"] = "redmatrix";
$a->strings["Thank You,"] = "Danke.";
$a->strings["%s Administrator"] = "der Administrator von %s";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -469,7 +469,7 @@ $a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
$a->strings["Attachments:"] = "Anhänge:";
$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
-$a->strings["Hubzilla event notification:"] = "Hubzilla Termin-Benachrichtigung:";
+$a->strings["Redmatrix event notification:"] = "RedMatrix Termin-Benachrichtigung:";
$a->strings["Starts:"] = "Beginnt:";
$a->strings["Finishes:"] = "Endet:";
$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
@@ -612,7 +612,7 @@ $a->strings["Permission denied"] = "Keine Berechtigung";
$a->strings["(Unknown)"] = "(Unbekannt)";
$a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
$a->strings["Visible to you only."] = "Nur für Dich sichtbar.";
-$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der Hubzilla sichtbar.";
+$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der RedMatrix sichtbar.";
$a->strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist.";
$a->strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar.";
$a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar.";
@@ -1018,7 +1018,7 @@ $a->strings["Currently blocked"] = "Derzeit blockiert";
$a->strings["Currently ignored"] = "Derzeit ignoriert";
$a->strings["Currently archived"] = "Derzeit archiviert";
$a->strings["Currently pending"] = "Derzeit anstehend";
-$a->strings["Hubzilla - &quot;The Network&quot;"] = "Hubzilla – &quot;Das Netzwerk&quot;";
+$a->strings["Red Matrix - &quot;The Network&quot;"] = "RedMatrix – &quot;Das Netzwerk&quot;";
$a->strings["Welcome to %s"] = "Willkommen auf %s";
$a->strings["Continue"] = "Fortfahren";
$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
@@ -1034,7 +1034,7 @@ $a->strings["Edit post"] = "Bearbeite Beitrag";
$a->strings["Delete item?"] = "Eintrag löschen?";
$a->strings["Item not available."] = "Element nicht verfügbar.";
$a->strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
-$a->strings["Hubzilla channel"] = "Hubzilla-Kanal";
+$a->strings["RedMatrix channel"] = "RedMatrix-Kanal";
$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
@@ -1088,7 +1088,7 @@ $a->strings["Title:"] = "Titel:";
$a->strings["Share this event"] = "Den Termin teilen";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
$a->strings["Public Sites"] = "Öffentliche Server";
-$a->strings["The listed sites allow public registration into the Hubzilla. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen.";
+$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen.";
$a->strings["Rate this hub"] = "Bewerte diesen Hub";
$a->strings["Site URL"] = "Server-URL";
$a->strings["Access Type"] = "Zugangstyp";
@@ -1237,7 +1237,7 @@ $a->strings["Please enable expert mode (in <a href=\"settings/features\">Setting
$a->strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
$a->strings["Personal menu to display in your channel pages"] = "Eigenes Menü zur Anzeige auf den Seiten deines Kanals";
$a->strings["Remove this channel"] = "Diesen Kanal löschen";
-$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++";
+$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++";
$a->strings["Tag removed"] = "Schlagwort entfernt";
$a->strings["Remove Item Tag"] = "Schlagwort entfernen";
$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
@@ -1258,17 +1258,17 @@ $a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
$a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der Hubzilla – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
$a->strings["Tag: "] = "Schlagwort: ";
$a->strings["Last background fetch: "] = "Letzter Hintergrundabruf:";
$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more about the Hubzilla."] = "Bitte besuchen Sie <a href=\"https://redmatrix.me\">Redmatrix.me</a>, um mehr über Hubzilla zu erfahren.";
+$a->strings["Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more about the Red Matrix."] = "Bitte besuchen Sie <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren.";
$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'hubzilla' at librelist - dot - com";
+$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
$a->strings["Site Administrators"] = "Administratoren";
$a->strings["Help:"] = "Hilfe:";
$a->strings["Not Found"] = "Nicht gefunden";
-$a->strings["Hubzilla Server - Setup"] = "Hubzilla Server - Installation";
+$a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation";
$a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
$a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
@@ -1278,7 +1278,7 @@ $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"
$a->strings["System check"] = "Systemprüfung";
$a->strings["Check again"] = "Bitte nochmal prüfen";
$a->strings["Database connection"] = "Datenbank Verbindung";
-$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
+$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
$a->strings["Database Server Name"] = "Datenbank-Servername";
@@ -1491,10 +1491,10 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
$a->strings["Send invitations"] = "Einladungen senden";
$a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
$a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["Please join my community on Hubzilla."] = "Schließe Dich uns in der Hubzilla an!";
+$a->strings["Please join my community on RedMatrix."] = "Schließe Dich uns in der RedMatrix an!";
$a->strings["You will need to supply this invitation code: "] = "Gib folgenden Einladungs-Code ein:";
-$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Registriere Dich auf irgendeinem Hubzilla-Server (sie sind alle miteinander verbunden)";
-$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Gib meine Hubzilla-Adresse im Suchfeld ein.";
+$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)";
+$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Gib meine RedMatrix-Adresse im Suchfeld ein.";
$a->strings["or visit "] = "oder besuche";
$a->strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
$a->strings["Location not found."] = "Klon nicht gefunden.";
@@ -1737,7 +1737,7 @@ $a->strings["Check to verify email addresses used in account registration (recom
$a->strings["Force publish"] = "Veröffentlichung erzwingen";
$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen.";
$a->strings["Disable discovery tab"] = "Den „Entdecken“-Reiter ausblenden";
-$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen Hubzilla-Hubs geholt wurden.";
+$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen RedMatrix-Hubs geholt wurden.";
$a->strings["No login on Homepage"] = "Kein Login auf der Homepage";
$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Aktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen (z.B. weil es das Layout der Homepage des Seiten-Kanals stört).";
$a->strings["Proxy user"] = "Proxy Benutzer";
@@ -1842,7 +1842,7 @@ $a->strings["Remove This Account"] = "Dieses Konto löschen";
$a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden.";
$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:";
$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen";
-$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem Hubzilla-Hub aus dem Netzwerk entfernt";
+$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt";
$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]";
$a->strings["Wall Photos"] = "Wall Fotos";
$a->strings["Profile Match"] = "Profil-Übereinstimmungen";
@@ -1870,7 +1870,7 @@ $a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
$a->strings["Link text"] = "Link Text";
$a->strings["URL of link"] = "URL des Links";
-$a->strings["Use Hubzilla magic-auth if available"] = "Verwende die automatische Hubzilla-Authentifizierung (magic-auth), wenn verfügbar";
+$a->strings["Use RedMatrix magic-auth if available"] = "Verwende die automatische RedMatrix-Authentifizierung (magic-auth), wenn verfügbar";
$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
$a->strings["Order in list"] = "Reihenfolge in der Liste";
$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
@@ -1891,7 +1891,7 @@ $a->strings["Help with this feature"] = "Hilfe zu dieser Funktion";
$a->strings["Layout Name"] = "Layout-Name";
$a->strings["Like/Dislike"] = "Mögen/Nicht mögen";
$a->strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
-$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "Bitte <a href=\"rmagic\">melde Dich mit Deiner Hubzilla-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der Hubzilla</a>, um fortzufahren.";
+$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "Bitte <a href=\"rmagic\">melde Dich mit Deiner RedMatrix-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der RedMatrix</a>, um fortzufahren.";
$a->strings["Invalid request."] = "Ungültige Anfrage.";
$a->strings["thing"] = "Sache";
$a->strings["Channel unavailable."] = "Kanal nicht vorhanden.";
@@ -2037,7 +2037,7 @@ $a->strings["Right offset of the section element"] = "Rechter Rand des Section E
$a->strings["Section width"] = "Breite der Section";
$a->strings["Left offset of the aside"] = "Linker Rand des Aside-Elements";
$a->strings["Right offset of the aside element"] = "Rechter Rand des Aside-Elements";
-$a->strings["Light (Hubzilla default)"] = "Hell (Hubzilla-Voreinstellung)";
+$a->strings["Light (Red Matrix default)"] = "Hell (RedMatrix-Voreinstellung)";
$a->strings["Narrow navbar"] = "Schmale Navigationsleiste";
$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
$a->strings["Navigation bar gradient top color"] = "Farbverlauf der Navigationsleiste: Farbe oben";
@@ -2070,7 +2070,7 @@ $a->strings["Sloppy photo albums"] = "Schräge Fotoalben";
$a->strings["Are you a clean desk or a messy desk person?"] = "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
$a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
-$a->strings["Create an account to access services and applications within the Hubzilla"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können.";
+$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können.";
$a->strings["Password"] = "Kennwort";
$a->strings["Remember me"] = "Angaben speichern";
$a->strings["Forgot your password?"] = "Passwort vergessen?";
diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
index e0319ca53..ca1a4985d 100644
--- a/view/de/update_fail_eml.tpl
+++ b/view/de/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hallo,
ich bin der Webserver für {{$sitename}};
-Die Hubzilla-Entwickler haben kürzlich das Update {{$update}} veröffentlicht,
+Die RedMatrix-Entwickler haben kürzlich das Update {{$update}} veröffentlicht,
aber als ich versuchte, es zu installieren, ging irgendwas furchtbar schief.
Das muss so bald als möglich gelöst werden und erfordert einen manuellen Eingriff.
Bitte kontaktiere einen Red-Entwickler, wenn Du nicht weißt, wie Du das Problem
diff --git a/view/nl/messages.po b/view/nl/messages.po
index 2365ac4fa..13bca342f 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Hubzilla\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-24 00:03-0700\n"
-"PO-Revision-Date: 2015-05-02 16:21+0000\n"
+"POT-Creation-Date: 2015-05-01 00:03-0700\n"
+"PO-Revision-Date: 2015-05-07 12:20+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -261,25 +261,25 @@ msgstr "Nieuwe pagina"
#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
#: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
#: ../../include/apps.php:254 ../../include/menu.php:43
-#: ../../mod/settings.php:644 ../../mod/thing.php:227
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/editlayout.php:139
+#: ../../mod/settings.php:644 ../../mod/webpages.php:179
+#: ../../mod/thing.php:227 ../../mod/connections.php:382
+#: ../../mod/connections.php:395 ../../mod/connections.php:414
+#: ../../mod/blocks.php:152 ../../mod/editlayout.php:139
#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
-#: ../../mod/menu.php:100 ../../mod/webpages.php:179
-#: ../../mod/editblock.php:140 ../../mod/blocks.php:148
-#: ../../mod/layouts.php:174
+#: ../../mod/menu.php:100 ../../mod/editblock.php:140
+#: ../../mod/layouts.php:182
msgid "Edit"
msgstr "Bewerken"
#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
-#: ../../mod/blocks.php:154 ../../mod/layouts.php:178
+#: ../../mod/blocks.php:158 ../../mod/layouts.php:187
msgid "View"
msgstr "Weergeven"
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1153 ../../mod/events.php:653
-#: ../../mod/photos.php:970 ../../mod/editwebpage.php:214
-#: ../../mod/editpost.php:149 ../../mod/webpages.php:186
+#: ../../include/conversation.php:1155 ../../mod/webpages.php:186
+#: ../../mod/events.php:653 ../../mod/photos.php:970
+#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:149
#: ../../mod/editblock.php:176
msgid "Preview"
msgstr "Voorvertoning"
@@ -297,12 +297,12 @@ msgid "Title"
msgstr "Titel"
#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
-#: ../../mod/blocks.php:145
+#: ../../mod/blocks.php:149 ../../mod/layouts.php:180
msgid "Created"
msgstr "Aangemaakt"
#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
-#: ../../mod/blocks.php:146
+#: ../../mod/blocks.php:150 ../../mod/layouts.php:181
msgid "Edited"
msgstr "Bewerkt"
@@ -551,7 +551,7 @@ msgstr "timeago.numbers"
msgid "parent"
msgstr "omhoog"
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2479
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
msgid "Collection"
msgstr "map"
@@ -592,7 +592,7 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
msgstr "%1$s van %2$s gebruikt (%3$s&#37;)"
#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1606 ../../include/apps.php:135
+#: ../../include/conversation.php:1609 ../../include/apps.php:135
#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr "Bestanden"
@@ -606,9 +606,9 @@ msgid "Shared"
msgstr "Gedeeld"
#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:104
-#: ../../mod/webpages.php:178 ../../mod/blocks.php:147
-#: ../../mod/layouts.php:170 ../../mod/new_channel.php:121
+#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:178
+#: ../../mod/blocks.php:151 ../../mod/menu.php:104 ../../mod/layouts.php:174
+#: ../../mod/new_channel.php:121
msgid "Create"
msgstr "Aanmaken"
@@ -638,10 +638,11 @@ msgstr "Laatst gewijzigd"
#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
#: ../../include/conversation.php:660 ../../include/apps.php:255
-#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
-#: ../../mod/photos.php:1050 ../../mod/editwebpage.php:225
-#: ../../mod/webpages.php:181 ../../mod/admin.php:817 ../../mod/admin.php:948
-#: ../../mod/editblock.php:113 ../../mod/blocks.php:150
+#: ../../mod/settings.php:645 ../../mod/webpages.php:181
+#: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:154
+#: ../../mod/photos.php:1050 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:225 ../../mod/admin.php:817
+#: ../../mod/admin.php:948 ../../mod/editblock.php:113
#: ../../mod/connedit.php:543
msgid "Delete"
msgstr "Verwijderen"
@@ -924,7 +925,7 @@ msgstr "Apps"
msgid "System"
msgstr "Systeem"
-#: ../../include/widgets.php:94 ../../include/conversation.php:1501
+#: ../../include/widgets.php:94 ../../include/conversation.php:1504
msgid "Personal"
msgstr "Persoonlijk"
@@ -1455,13 +1456,13 @@ msgid "I abstain"
msgstr "Onthouding"
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1674 ../../mod/photos.php:1003
+#: ../../include/conversation.php:1677 ../../mod/photos.php:1003
#: ../../mod/photos.php:1015
msgid "View all"
msgstr "Toon alles"
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1698 ../../include/identity.php:1133
+#: ../../include/conversation.php:1701 ../../include/identity.php:1133
#: ../../mod/photos.php:1007
msgctxt "noun"
msgid "Like"
@@ -1469,7 +1470,7 @@ msgid_plural "Likes"
msgstr[0] "vindt dit leuk"
msgstr[1] "vinden dit leuk"
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1701
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
#: ../../mod/photos.php:1012
msgctxt "noun"
msgid "Dislike"
@@ -1600,7 +1601,7 @@ msgid "Close"
msgstr "Sluiten"
#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1206 ../../mod/photos.php:950
+#: ../../include/conversation.php:1209 ../../mod/photos.php:950
#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
#: ../../mod/mail.php:241 ../../mod/mail.php:356
@@ -1612,31 +1613,31 @@ msgstr "Even wachten"
msgid "This is you"
msgstr "Dit ben jij"
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1179
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
msgid "Bold"
msgstr "Vet"
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1180
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
msgid "Italic"
msgstr "Cursief"
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1181
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
msgid "Underline"
msgstr "Onderstrepen"
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1182
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
msgid "Quote"
msgstr "Citeren"
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1183
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
msgid "Code"
@@ -1654,7 +1655,7 @@ msgstr "Link invoegen"
msgid "Video"
msgstr "Video"
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1233
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
msgid "Encrypt text"
msgstr "Tekst versleutelen"
@@ -1933,96 +1934,96 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: ../../include/text.php:1236
+#: ../../include/text.php:1244
msgid "unknown.???"
msgstr "onbekend.???"
-#: ../../include/text.php:1237
+#: ../../include/text.php:1245
msgid "bytes"
msgstr "bytes"
-#: ../../include/text.php:1273
+#: ../../include/text.php:1281
msgid "remove category"
msgstr "categorie verwijderen"
-#: ../../include/text.php:1348
+#: ../../include/text.php:1356
msgid "remove from file"
msgstr "uit map verwijderen"
-#: ../../include/text.php:1424 ../../include/text.php:1435
+#: ../../include/text.php:1436 ../../include/text.php:1447
#: ../../mod/connedit.php:661
msgid "Click to open/close"
msgstr "Klik om te openen of te sluiten"
-#: ../../include/text.php:1591 ../../mod/events.php:444
+#: ../../include/text.php:1609 ../../mod/events.php:444
msgid "Link to Source"
msgstr "Originele locatie"
-#: ../../include/text.php:1612 ../../include/text.php:1683
+#: ../../include/text.php:1630 ../../include/text.php:1701
msgid "default"
msgstr "standaard"
-#: ../../include/text.php:1620
+#: ../../include/text.php:1638
msgid "Page layout"
-msgstr "Lay-out pagina"
+msgstr "Pagina-lay-out"
-#: ../../include/text.php:1620
+#: ../../include/text.php:1638
msgid "You can create your own with the layouts tool"
msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
-#: ../../include/text.php:1661
+#: ../../include/text.php:1679
msgid "Page content type"
msgstr "Opmaaktype pagina"
-#: ../../include/text.php:1695
+#: ../../include/text.php:1713
msgid "Select an alternate language"
msgstr "Kies een andere taal"
-#: ../../include/text.php:1814 ../../include/conversation.php:120
+#: ../../include/text.php:1832 ../../include/conversation.php:120
#: ../../include/diaspora.php:2081 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:43
msgid "photo"
msgstr "foto"
-#: ../../include/text.php:1817 ../../include/conversation.php:123
+#: ../../include/text.php:1835 ../../include/conversation.php:123
#: ../../mod/like.php:348 ../../mod/tagger.php:47
msgid "event"
msgstr "gebeurtenis"
-#: ../../include/text.php:1820 ../../include/conversation.php:148
+#: ../../include/text.php:1838 ../../include/conversation.php:148
#: ../../include/diaspora.php:2081 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:51
msgid "status"
msgstr "bericht"
-#: ../../include/text.php:1822 ../../include/conversation.php:150
+#: ../../include/text.php:1840 ../../include/conversation.php:150
#: ../../mod/tagger.php:53
msgid "comment"
msgstr "reactie"
-#: ../../include/text.php:1827
+#: ../../include/text.php:1845
msgid "activity"
msgstr "activiteit"
-#: ../../include/text.php:2122
+#: ../../include/text.php:2140
msgid "Design Tools"
msgstr "Ontwerp-hulpmiddelen"
-#: ../../include/text.php:2125 ../../mod/blocks.php:143
+#: ../../include/text.php:2143 ../../mod/blocks.php:146
msgid "Blocks"
msgstr "Blokken"
-#: ../../include/text.php:2126 ../../mod/menu.php:95
+#: ../../include/text.php:2144 ../../mod/menu.php:95
msgid "Menus"
msgstr "Menu's"
-#: ../../include/text.php:2127 ../../mod/layouts.php:169
+#: ../../include/text.php:2145 ../../mod/layouts.php:173
msgid "Layouts"
msgstr "Lay-outs"
-#: ../../include/text.php:2128
+#: ../../include/text.php:2146
msgid "Pages"
msgstr "Pagina's"
@@ -2067,7 +2068,7 @@ msgstr "Profiel bewerken"
msgid "Edit your profile"
msgstr "Jouw profiel bewerken"
-#: ../../include/nav.php:97 ../../include/conversation.php:1597
+#: ../../include/nav.php:97 ../../include/conversation.php:1600
#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr "Foto's"
@@ -2088,7 +2089,7 @@ msgstr "Chatten"
msgid "Your chatrooms"
msgstr "Jouw chatkanalen"
-#: ../../include/nav.php:109 ../../include/conversation.php:1632
+#: ../../include/nav.php:109 ../../include/conversation.php:1635
#: ../../include/apps.php:129
msgid "Bookmarks"
msgstr "Bladwijzers"
@@ -2097,7 +2098,7 @@ msgstr "Bladwijzers"
msgid "Your bookmarks"
msgstr "Jouw bladwijzers"
-#: ../../include/nav.php:113 ../../include/conversation.php:1642
+#: ../../include/nav.php:113 ../../include/conversation.php:1645
#: ../../include/apps.php:136 ../../mod/webpages.php:176
msgid "Webpages"
msgstr "Webpagina's"
@@ -2140,7 +2141,7 @@ msgid "Create an account"
msgstr "Maak een account aan"
#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72 ../../mod/layouts.php:171
+#: ../../mod/help.php:72 ../../mod/layouts.php:175
msgid "Help"
msgstr "Hulp"
@@ -2338,17 +2339,17 @@ msgstr "Bezoek het %2$s van %1$s"
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:735
-#: ../../include/bbcode.php:738 ../../include/bbcode.php:743
-#: ../../include/bbcode.php:746 ../../include/bbcode.php:749
-#: ../../include/bbcode.php:752 ../../include/bbcode.php:757
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:743
+#: ../../include/bbcode.php:746 ../../include/bbcode.php:751
+#: ../../include/bbcode.php:754 ../../include/bbcode.php:757
#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
-#: ../../include/bbcode.php:768 ../../include/bbcode.php:771
-#: ../../include/bbcode.php:774
+#: ../../include/bbcode.php:768 ../../include/bbcode.php:773
+#: ../../include/bbcode.php:776 ../../include/bbcode.php:779
+#: ../../include/bbcode.php:782
msgid "Image/photo"
msgstr "Afbeelding/foto"
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:785
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:793
msgid "Encrypted content"
msgstr "Versleutelde inhoud"
@@ -2369,15 +2370,15 @@ msgstr "%1$s schreef het volgende %2$s %3$s"
msgid "post"
msgstr "bericht"
-#: ../../include/bbcode.php:485
+#: ../../include/bbcode.php:493
msgid "Different viewers will see this text differently"
msgstr "Deze tekst wordt per persoon anders weergeven."
-#: ../../include/bbcode.php:696
+#: ../../include/bbcode.php:704
msgid "$1 spoiler"
msgstr "$1 spoiler"
-#: ../../include/bbcode.php:723
+#: ../../include/bbcode.php:731
msgid "$1 wrote:"
msgstr "$1 schreef:"
@@ -2440,33 +2441,34 @@ msgstr "Item niet gevonden."
#: ../../mod/profile.php:64 ../../mod/profile.php:72
#: ../../mod/achievements.php:30 ../../mod/manage.php:6
#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/thing.php:241 ../../mod/thing.php:256 ../../mod/thing.php:290
-#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
-#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/connections.php:169
-#: ../../mod/photos.php:68 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
-#: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
-#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/webpages.php:69
-#: ../../mod/profiles.php:188 ../../mod/profiles.php:576
-#: ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
+#: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256
+#: ../../mod/thing.php:290 ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/like.php:178 ../../mod/events.php:219
+#: ../../mod/group.php:9 ../../mod/setup.php:207 ../../mod/common.php:35
+#: ../../mod/connections.php:169 ../../mod/blocks.php:69
+#: ../../mod/blocks.php:76 ../../mod/photos.php:68 ../../mod/pdledit.php:21
+#: ../../mod/authtest.php:13 ../../mod/editlayout.php:63
+#: ../../mod/editlayout.php:87 ../../mod/chat.php:90 ../../mod/chat.php:95
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/mood.php:111 ../../mod/connedit.php:331 ../../mod/mail.php:114
-#: ../../mod/notifications.php:66 ../../mod/regmod.php:17
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
-#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28
-#: ../../mod/page.php:79 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
+#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:331
+#: ../../mod/mail.php:114 ../../mod/notifications.php:66
+#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
+#: ../../mod/network.php:12 ../../mod/page.php:28 ../../mod/page.php:79
+#: ../../mod/bookmarks.php:46 ../../mod/channel.php:100
#: ../../mod/channel.php:219 ../../mod/channel.php:262
#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
@@ -2807,301 +2809,299 @@ msgstr "%s vinden dit leuk."
msgid "%s don't like this."
msgstr "%s vinden dit niet leuk."
-#: ../../include/conversation.php:1138
+#: ../../include/conversation.php:1140
msgid "Visible to <strong>everybody</strong>"
msgstr "Voor <strong>iedereen</strong> zichtbaar"
-#: ../../include/conversation.php:1139 ../../mod/mail.php:174
+#: ../../include/conversation.php:1141 ../../mod/mail.php:174
#: ../../mod/mail.php:289
msgid "Please enter a link URL:"
msgstr "Vul een internetadres/URL in:"
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1142
msgid "Please enter a video link/URL:"
msgstr "Vul een videolink/URL in:"
-#: ../../include/conversation.php:1141
+#: ../../include/conversation.php:1143
msgid "Please enter an audio link/URL:"
msgstr "Vul een audiolink/URL in:"
-#: ../../include/conversation.php:1142
+#: ../../include/conversation.php:1144
msgid "Tag term:"
msgstr "Tag:"
-#: ../../include/conversation.php:1143 ../../mod/filer.php:49
+#: ../../include/conversation.php:1145 ../../mod/filer.php:49
msgid "Save to Folder:"
msgstr "Bewaar in map: "
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1146
msgid "Where are you right now?"
msgstr "Waar bevind je je op dit moment?"
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
#: ../../mod/mail.php:175 ../../mod/mail.php:290
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verloopt op DD-MM-YYYY om HH:MM"
-#: ../../include/conversation.php:1172 ../../mod/photos.php:949
-#: ../../mod/editlayout.php:197 ../../mod/webpages.php:180
-#: ../../mod/blocks.php:149 ../../mod/layouts.php:175
+#: ../../include/conversation.php:1174 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:153 ../../mod/photos.php:949 ../../mod/layouts.php:183
msgid "Share"
msgstr "Delen"
-#: ../../include/conversation.php:1174
+#: ../../include/conversation.php:1176
msgid "Page link name"
msgstr "Linknaam pagina"
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1179
msgid "Post as"
msgstr "Bericht plaatsen als"
-#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
+#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145
#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
msgid "Upload photo"
msgstr "Foto uploaden"
-#: ../../include/conversation.php:1185
+#: ../../include/conversation.php:1187
msgid "upload photo"
msgstr "foto uploaden"
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146
#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
msgid "Attach file"
msgstr "Bestand toevoegen"
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1189
msgid "attach file"
msgstr "bestand toevoegen"
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147
#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
msgid "Insert web link"
msgstr "Weblink invoegen"
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1191
msgid "web link"
msgstr "Weblink"
-#: ../../include/conversation.php:1190
+#: ../../include/conversation.php:1192
msgid "Insert video link"
msgstr "Videolink invoegen"
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1193
msgid "video link"
msgstr "videolink"
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1194
msgid "Insert audio link"
msgstr "Audiolink invoegen"
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1195
msgid "audio link"
msgstr "audiolink"
-#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
+#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
#: ../../mod/editblock.php:153
msgid "Set your location"
msgstr "Locatie instellen"
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1197
msgid "set location"
msgstr "locatie instellen"
-#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
msgid "Toggle voting"
msgstr "Stemmen in- of uitschakelen"
-#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
+#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
#: ../../mod/editblock.php:154
msgid "Clear browser location"
msgstr "Locatie van webbrowser wissen"
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1202
msgid "clear location"
msgstr "locatie wissen"
-#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:141
-#: ../../mod/editblock.php:167
+#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
+#: ../../mod/editpost.php:141 ../../mod/editblock.php:167
msgid "Title (optional)"
msgstr "Titel (optioneel)"
-#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
+#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
#: ../../mod/editblock.php:170
msgid "Categories (optional, comma-separated list)"
msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
-#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
+#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
#: ../../mod/editblock.php:156
msgid "Permission settings"
msgstr "Permissies"
-#: ../../include/conversation.php:1208
+#: ../../include/conversation.php:1211
msgid "permissions"
msgstr "permissies"
-#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
+#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
#: ../../mod/editblock.php:164
msgid "Public post"
msgstr "Openbaar bericht"
-#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
+#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
#: ../../mod/editblock.php:171
msgid "Example: bob@example.com, mary@example.com"
msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
-#: ../../include/conversation.php:1231 ../../mod/editlayout.php:177
+#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178
#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:155
#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
msgid "Set expiration date"
msgstr "Verloopdatum instellen"
-#: ../../include/conversation.php:1235 ../../mod/events.php:637
+#: ../../include/conversation.php:1238 ../../mod/events.php:637
#: ../../mod/editpost.php:159
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1236 ../../mod/settings.php:583
+#: ../../include/conversation.php:1239 ../../mod/settings.php:583
#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
msgid "Cancel"
msgstr "Annuleren"
-#: ../../include/conversation.php:1478
+#: ../../include/conversation.php:1481
msgid "Discover"
msgstr "Ontdekken"
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1484
msgid "Imported public streams"
msgstr "Openbare streams importeren"
-#: ../../include/conversation.php:1486
+#: ../../include/conversation.php:1489
msgid "Commented Order"
msgstr "Nieuwe reacties bovenaan"
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1492
msgid "Sort by Comment Date"
msgstr "Berichten met nieuwe reacties bovenaan"
-#: ../../include/conversation.php:1493
+#: ../../include/conversation.php:1496
msgid "Posted Order"
msgstr "Nieuwe berichten bovenaan"
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1499
msgid "Sort by Post Date"
msgstr "Nieuwe berichten bovenaan"
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1507
msgid "Posts that mention or involve you"
msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
-#: ../../include/conversation.php:1510 ../../mod/connections.php:212
+#: ../../include/conversation.php:1513 ../../mod/connections.php:212
#: ../../mod/connections.php:225 ../../mod/menu.php:102
msgid "New"
msgstr "Nieuw"
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1516
msgid "Activity Stream - by date"
msgstr "Activiteitenstroom - volgens datum"
-#: ../../include/conversation.php:1519
+#: ../../include/conversation.php:1522
msgid "Starred"
msgstr "Met ster"
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1525
msgid "Favourite Posts"
msgstr "Favoriete berichten"
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1532
msgid "Spam"
msgstr "Spam"
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1535
msgid "Posts flagged as SPAM"
msgstr "Berichten gemarkeerd als SPAM"
-#: ../../include/conversation.php:1576 ../../mod/admin.php:952
+#: ../../include/conversation.php:1579 ../../mod/admin.php:952
msgid "Channel"
msgstr "Kanaal"
-#: ../../include/conversation.php:1579
+#: ../../include/conversation.php:1582
msgid "Status Messages and Posts"
msgstr "Berichten in dit kanaal"
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1591
msgid "About"
msgstr "Over"
-#: ../../include/conversation.php:1591
+#: ../../include/conversation.php:1594
msgid "Profile Details"
msgstr "Profiel"
-#: ../../include/conversation.php:1600 ../../include/photos.php:359
+#: ../../include/conversation.php:1603 ../../include/photos.php:359
msgid "Photo Albums"
msgstr "Fotoalbums"
-#: ../../include/conversation.php:1609
+#: ../../include/conversation.php:1612
msgid "Files and Storage"
msgstr "Bestanden en opslagruimte"
-#: ../../include/conversation.php:1619 ../../include/conversation.php:1622
+#: ../../include/conversation.php:1622 ../../include/conversation.php:1625
msgid "Chatrooms"
msgstr "Chatkanalen"
-#: ../../include/conversation.php:1635
+#: ../../include/conversation.php:1638
msgid "Saved Bookmarks"
msgstr "Opgeslagen bladwijzers"
-#: ../../include/conversation.php:1645
+#: ../../include/conversation.php:1648
msgid "Manage Webpages"
msgstr "Webpagina's beheren"
-#: ../../include/conversation.php:1704
+#: ../../include/conversation.php:1707
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "aanwezig"
msgstr[1] "aanwezig"
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1710
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] "niet aanwezig"
msgstr[1] "niet aanwezig"
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] "nog niet beslist"
msgstr[1] "nog niet beslist"
-#: ../../include/conversation.php:1713
+#: ../../include/conversation.php:1716
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] "eens"
msgstr[1] "eens"
-#: ../../include/conversation.php:1716
+#: ../../include/conversation.php:1719
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] "oneens"
msgstr[1] "oneens"
-#: ../../include/conversation.php:1719
+#: ../../include/conversation.php:1722
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -3340,11 +3340,11 @@ msgid "Requested channel is not available."
msgstr "Opgevraagd kanaal is niet beschikbaar."
#: ../../include/identity.php:677 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/connect.php:13
-#: ../../mod/hcard.php:8 ../../mod/editlayout.php:28
-#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54
-#: ../../mod/webpages.php:29 ../../mod/editblock.php:29
-#: ../../mod/blocks.php:29 ../../mod/layouts.php:29
+#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
+#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29
+#: ../../mod/layouts.php:29
msgid "Requested profile is not available."
msgstr "Opgevraagd profiel is niet beschikbaar"
@@ -4518,6 +4518,10 @@ msgid ""
" 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?"
+#: ../../mod/webpages.php:189
+msgid "Page Title"
+msgstr "Paginatitel"
+
#: ../../mod/follow.php:25
msgid "Channel added."
msgstr "Kanaal toegevoegd."
@@ -5570,22 +5574,13 @@ msgstr "Doorzoek jouw connecties"
msgid "Finding: "
msgstr "Zoeken naar: "
-#: ../../mod/impel.php:33
-msgid "webpage"
-msgstr "Webpagina"
-
-#: ../../mod/impel.php:38
-msgid "block"
-msgstr "blok"
-
-#: ../../mod/impel.php:43
-msgid "layout"
-msgstr "lay-out"
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:147
+msgid "Block Name"
+msgstr "Bloknaam"
-#: ../../mod/impel.php:117
-#, php-format
-msgid "%s element installed"
-msgstr "%s onderdeel geïnstalleerd"
+#: ../../mod/blocks.php:148
+msgid "Block Title"
+msgstr "Bloktitel"
#: ../../mod/tagger.php:96
#, php-format
@@ -5817,7 +5812,7 @@ msgstr "Lay-out niet gevonden."
msgid "Module Name:"
msgstr "Modulenaam:"
-#: ../../mod/pdledit.php:55 ../../mod/layouts.php:108
+#: ../../mod/pdledit.php:55
msgid "Layout Help"
msgstr "Lay-out-hulp"
@@ -5915,13 +5910,13 @@ msgstr "Stel deze hub als mijn primaire locatie in"
msgid "Import existing posts if possible"
msgstr "Importeer bestaande berichten (wanneer mogelijk)"
-#: ../../mod/editlayout.php:78 ../../mod/editwebpage.php:77
+#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77
#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
#: ../../mod/editblock.php:94
msgid "Item not found"
msgstr "Item niet gevonden"
-#: ../../mod/editlayout.php:108
+#: ../../mod/editlayout.php:106
msgid "Edit Layout"
msgstr "Lay-out bewerken"
@@ -5944,9 +5939,14 @@ msgstr "Vorbis-video [.ogg] invoegen"
msgid "Insert Vorbis [.ogg] audio"
msgstr "Vorbis-audio [.ogg] invoegen"
-#: ../../mod/editlayout.php:182
-msgid "Delete Layout"
-msgstr "Lay-out verwijderen"
+#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
+msgid "Layout Description (Optional)"
+msgstr "Lay-out-omschrijving (optioneel)"
+
+#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
+#: ../../mod/layouts.php:178
+msgid "Layout Name"
+msgstr "Naam lay-out"
#: ../../mod/chat.php:19 ../../mod/channel.php:25
msgid "You must be logged in to see this page."
@@ -6273,7 +6273,7 @@ msgstr "Niet in staat om menu aan te maken."
#: ../../mod/menu.php:86 ../../mod/menu.php:98
msgid "Menu Name"
-msgstr "Naam menu"
+msgstr "Menunaam"
#: ../../mod/menu.php:86
msgid "Unique name (not visible on webpage) - required"
@@ -6281,7 +6281,7 @@ msgstr "Unieke naam vereist (niet zichtbaar op webpagina)"
#: ../../mod/menu.php:87 ../../mod/menu.php:99
msgid "Menu Title"
-msgstr "Titel menu"
+msgstr "Menutitel"
#: ../../mod/menu.php:87
msgid "Visible on webpage - leave empty for no title"
@@ -6460,9 +6460,22 @@ msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
msgid "Visible To"
msgstr "Zichtbaar voor"
-#: ../../mod/webpages.php:189
-msgid "Page Title"
-msgstr "Titel pagina"
+#: ../../mod/impel.php:33
+msgid "webpage"
+msgstr "Webpagina"
+
+#: ../../mod/impel.php:38
+msgid "block"
+msgstr "blok"
+
+#: ../../mod/impel.php:43
+msgid "layout"
+msgstr "lay-out"
+
+#: ../../mod/impel.php:117
+#, php-format
+msgid "%s element installed"
+msgstr "%s onderdeel geïnstalleerd"
#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
@@ -7868,9 +7881,17 @@ msgstr "Privacy-informatie op afstand niet beschikbaar."
msgid "Visible to:"
msgstr "Zichtbaar voor:"
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:144
-msgid "Block Name"
-msgstr "Bloknaam"
+#: ../../mod/layouts.php:175
+msgid "Comanche page description language help"
+msgstr "Hulp met de paginabeschrijvingstaal Comanche"
+
+#: ../../mod/layouts.php:179
+msgid "Layout Description"
+msgstr "Lay-out-omschrijving"
+
+#: ../../mod/layouts.php:184
+msgid "Download PDL file"
+msgstr "Download PDL-bestand"
#: ../../mod/id.php:11
msgid "First Name"
@@ -7952,18 +7973,6 @@ msgstr "Verwijder conversatie"
msgid "D, d M Y - g:i A"
msgstr "D, j M Y - G:i"
-#: ../../mod/layouts.php:111
-msgid "Help with this feature"
-msgstr "Hulp voor dit onderdeel"
-
-#: ../../mod/layouts.php:132
-msgid "Layout Name"
-msgstr "Naam lay-out"
-
-#: ../../mod/layouts.php:171
-msgid "Comanche page description language help"
-msgstr "Hulp met de paginabeschrijvingstaal Comanche"
-
#: ../../mod/mood.php:131
msgid "Set your current mood and tell your friends"
msgstr "Noteer je huidige stemming en toon het aan je connecties"
diff --git a/view/nl/strings.php b/view/nl/strings.php
index c47844b2c..613268b8e 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -455,7 +455,7 @@ $a->strings["remove from file"] = "uit map verwijderen";
$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
$a->strings["Link to Source"] = "Originele locatie";
$a->strings["default"] = "standaard";
-$a->strings["Page layout"] = "Lay-out pagina";
+$a->strings["Page layout"] = "Pagina-lay-out";
$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
$a->strings["Page content type"] = "Opmaaktype pagina";
$a->strings["Select an alternate language"] = "Kies een andere taal";
@@ -1071,6 +1071,7 @@ $a->strings["Authorize application connection"] = "Geef toestemming voor applica
$a->strings["Return to your app and insert this Securty Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:";
$a->strings["Please login to continue."] = "Inloggen om verder te kunnen gaan.";
$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?";
+$a->strings["Page Title"] = "Paginatitel";
$a->strings["Channel added."] = "Kanaal toegevoegd.";
$a->strings["Tag removed"] = "Tag verwijderd";
$a->strings["Remove Item Tag"] = "Verwijder item-tag";
@@ -1307,10 +1308,8 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
$a->strings["Edit connection"] = "Connectie bewerken";
$a->strings["Search your connections"] = "Doorzoek jouw connecties";
$a->strings["Finding: "] = "Zoeken naar: ";
-$a->strings["webpage"] = "Webpagina";
-$a->strings["block"] = "blok";
-$a->strings["layout"] = "lay-out";
-$a->strings["%s element installed"] = "%s onderdeel geïnstalleerd";
+$a->strings["Block Name"] = "Bloknaam";
+$a->strings["Block Title"] = "Bloktitel";
$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++";
$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
@@ -1395,7 +1394,8 @@ $a->strings["Delete layout?"] = "Lay-out verwijderen?";
$a->strings["Insert YouTube video"] = "YouTube-video invoegen";
$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
-$a->strings["Delete Layout"] = "Lay-out verwijderen";
+$a->strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
+$a->strings["Layout Name"] = "Naam lay-out";
$a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
$a->strings["Room not found"] = "Chatkanaal niet gevonden";
$a->strings["Leave Room"] = "Chatkanaal verlaten";
@@ -1475,9 +1475,9 @@ $a->strings["Source removed"] = "Bron verwijderd";
$a->strings["Unable to remove source."] = "Verwijderen bron mislukt.";
$a->strings["Unable to update menu."] = "Niet in staat om menu aan te passen";
$a->strings["Unable to create menu."] = "Niet in staat om menu aan te maken.";
-$a->strings["Menu Name"] = "Naam menu";
+$a->strings["Menu Name"] = "Menunaam";
$a->strings["Unique name (not visible on webpage) - required"] = "Unieke naam vereist (niet zichtbaar op webpagina)";
-$a->strings["Menu Title"] = "Titel menu";
+$a->strings["Menu Title"] = "Menutitel";
$a->strings["Visible on webpage - leave empty for no title"] = "Zichtbaar op webpagina (leeg laten voor geen titel)";
$a->strings["Allow Bookmarks"] = "Bladwijzers toestaan";
$a->strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan";
@@ -1522,7 +1522,10 @@ $a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificator";
$a->strings["Profile Visibility Editor"] = "Zichtbaarheid profiel ";
$a->strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen";
$a->strings["Visible To"] = "Zichtbaar voor";
-$a->strings["Page Title"] = "Titel pagina";
+$a->strings["webpage"] = "Webpagina";
+$a->strings["block"] = "blok";
+$a->strings["layout"] = "lay-out";
+$a->strings["%s element installed"] = "%s onderdeel geïnstalleerd";
$a->strings["Profile not found."] = "Profiel niet gevonden.";
$a->strings["Profile deleted."] = "Profiel verwijderd.";
$a->strings["Profile-"] = "Profiel-";
@@ -1863,7 +1866,9 @@ $a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw l
$a->strings["[Embedded content - reload page to view]"] = "[Ingesloten inhoud - ververs pagina om te bekijken] ";
$a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
$a->strings["Visible to:"] = "Zichtbaar voor:";
-$a->strings["Block Name"] = "Bloknaam";
+$a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
+$a->strings["Layout Description"] = "Lay-out-omschrijving";
+$a->strings["Download PDL file"] = "Download PDL-bestand";
$a->strings["First Name"] = "Voornaam";
$a->strings["Last Name"] = "Achternaam";
$a->strings["Nickname"] = "Bijnaam";
@@ -1884,9 +1889,6 @@ $a->strings["Conversation removed."] = "Conversatie verwijderd";
$a->strings["No messages."] = "Geen berichten";
$a->strings["Delete conversation"] = "Verwijder conversatie";
$a->strings["D, d M Y - g:i A"] = "D, j M Y - G:i";
-$a->strings["Help with this feature"] = "Hulp voor dit onderdeel";
-$a->strings["Layout Name"] = "Naam lay-out";
-$a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
$a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties";
$a->strings["Total votes"] = "Totaal aantal stemmen";
$a->strings["Average Rating"] = "Gemiddelde waardering";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a5e5dffdb..83b10b527 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -790,7 +790,7 @@ a.rateme, div.rateme {
}
nav .acpopup {
- top: 49px !important;
+ top: 50px !important;
margin-left: -35px;
width: 290px;
}
@@ -1231,7 +1231,7 @@ div.jGrowl div.jGrowl-notification {
#nav-search-text-ac .autocomplete {
position: fixed;
- top: 50px;
+ top: 51px;
border: 1px solid $nav_bd;
border-top: none;
}
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index b3704e86e..da3172434 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -19,6 +19,7 @@
{{/if}}
{{include file="field_input.tpl" field=$menu_name}}
{{include file="field_input.tpl" field=$menu_desc}}
+
{{include file="field_checkbox.tpl" field=$menu_bookmark}}
<div class="menuedit-submit-wrapper form-group pull-right" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 3200766ca..8b8afa24c 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -11,6 +11,13 @@
{{/if}}
{{include file="field_input.tpl" field=$mitem_desc}}
{{include file="field_input.tpl" field=$mitem_link}}
+ {{if $menu_names}}
+ <datalist id="menu-names">
+ {{foreach $menu_names as $menu_name}}
+ <option value="{{$menu_name}}">
+ {{/foreach}}
+ </datalist>
+ {{/if}}
{{include file="field_input.tpl" field=$mitem_order}}
{{include file="field_checkbox.tpl" field=$usezid}}
{{include file="field_checkbox.tpl" field=$newwin}}
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index 57caf25fc..4ecf823dd 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -1,13 +1,20 @@
+{{if $wrap}}
<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
+{{/if}}
{{if $menu.menu_desc}}
<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
{{/if}}
- {{if $items }}
- <ul class="pmenu-body{{if !$class}} nav nav-pills nav-stacked{{/if}}">
+ {{if $items}}
+ <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills nav-stacked{{elseif !$wrap || $class}} {{$class}}{{/if}}">
{{foreach $items as $mitem }}
- <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li>
+ <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item{{if $mitem.submenu}} dropdown{{/if}}">
+ <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}"{{if $mitem.submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a>
+ {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}}
+ </li>
{{/foreach }}
</ul>
{{/if}}
+{{if $wrap}}
<div class="pmenu-end"></div>
</div>
+{{/if}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:19:05 +0000