aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-05 03:31:50 -0700
committerzotlabs <mike@macgirvin.com>2016-11-05 03:31:50 -0700
commit8811ca9e9efc8e177a49702066402fae819bdf5b (patch)
tree815d3b4c21c430b89a6ef6249a8339663b991360
parentb541351a0a52d156085b0f1e06079c1c2e409eb8 (diff)
downloadvolse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.tar.gz
volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.tar.bz2
volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.zip
provide /locs link on settings page if there is more than one hubloc for this channnel *that isn't deleted*.
-rw-r--r--Zotlabs/Module/Locs.php2
-rw-r--r--Zotlabs/Module/Ping.php4
-rw-r--r--include/channel.php2
-rw-r--r--include/widgets.php4
-rw-r--r--util/hmessages.po545
5 files changed, 277 insertions, 280 deletions
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php
index 4b1e3ffe2..47ece8041 100644
--- a/Zotlabs/Module/Locs.php
+++ b/Zotlabs/Module/Locs.php
@@ -80,7 +80,7 @@ class Locs extends \Zotlabs\Web\Controller {
- function get() {
+ function get() {
if(! local_channel()) {
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index c385201ce..bf2fa5cc9 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -324,10 +324,6 @@ class Ping extends \Zotlabs\Web\Controller {
if($r) {
foreach($r as $rr) {
- if($rr['adjust'])
- $md = datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'Y/m');
- else
- $md = datetime_convert('UTC', 'UTC', $rr['dtstart'], 'Y/m');
$strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
$today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
diff --git a/include/channel.php b/include/channel.php
index 6d180da01..1f12e9927 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -162,7 +162,7 @@ function channel_total() {
* Also creates the related xchan, hubloc, profile, and "self" abook records,
* and an empty "Friends" group/collection for the new channel.
*
- * @param array $arr assoziative array with:
+ * @param array $arr associative array with:
* * \e string \b name full name of channel
* * \e string \b nickname "email/url-compliant" nickname
* * \e int \b account_id to attach with this channel
diff --git a/include/widgets.php b/include/widgets.php
index cc0b20a72..6cff4e4b7 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -581,11 +581,11 @@ function widget_settings_menu($arr) {
if($abk)
$abook_self_id = $abk[0]['abook_id'];
- $hublocs = q("select count(*) as total from hubloc where hubloc_hash = '%s'",
+ $x = q("select count(*) as total from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 ",
dbesc($channel['channel_hash'])
);
- $hublocs = (($hublocs[0]['total'] > 1) ? true : false);
+ $hublocs = (($x && $x[0]['total'] > 1) ? true : false);
$tabs = array(
array(
diff --git a/util/hmessages.po b/util/hmessages.po
index 310d675d7..544dfea41 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.15.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-28 00:05-0700\n"
+"POT-Creation-Date: 2016-11-04 00:05-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"
@@ -249,7 +249,7 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Oauth.php:115
#: ../../Zotlabs/Module/Chat.php:250
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1132
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:136
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:132
msgid "Name"
msgstr ""
@@ -366,8 +366,8 @@ msgstr ""
#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:595
#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Channel.php:106 ../../Zotlabs/Module/Channel.php:231
-#: ../../Zotlabs/Module/Channel.php:271 ../../Zotlabs/Module/Locs.php:87
+#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
+#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Locs.php:87
#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mitem.php:115
#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Photos.php:73
@@ -382,7 +382,7 @@ msgstr ""
#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113
#: ../../Zotlabs/Module/Profile_photo.php:273
#: ../../Zotlabs/Module/Profile_photo.php:286
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Events.php:266
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Events.php:267
#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
#: ../../Zotlabs/Module/Connedit.php:395
#: ../../Zotlabs/Module/Service_limits.php:11
@@ -400,13 +400,13 @@ msgstr ""
#: ../../extend/addon/addon/pumpio/pumpio.php:40
#: ../../extend/addon/addon/openid/Mod_Id.php:53
#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58
-#: ../../include/items.php:3490 ../../include/photos.php:27
-#: ../../include/attach.php:142 ../../include/attach.php:189
-#: ../../include/attach.php:253 ../../include/attach.php:267
-#: ../../include/attach.php:274 ../../include/attach.php:341
-#: ../../include/attach.php:355 ../../include/attach.php:362
-#: ../../include/attach.php:439 ../../include/attach.php:906
-#: ../../include/attach.php:977 ../../include/attach.php:1135
+#: ../../include/photos.php:27 ../../include/attach.php:142
+#: ../../include/attach.php:189 ../../include/attach.php:253
+#: ../../include/attach.php:267 ../../include/attach.php:274
+#: ../../include/attach.php:341 ../../include/attach.php:355
+#: ../../include/attach.php:362 ../../include/attach.php:439
+#: ../../include/attach.php:906 ../../include/attach.php:977
+#: ../../include/attach.php:1135 ../../include/items.php:3490
msgid "Permission denied."
msgstr ""
@@ -737,10 +737,10 @@ msgstr ""
#: ../../Zotlabs/Module/Setup.php:315 ../../Zotlabs/Module/Setup.php:363
#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Poke.php:186
#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:483
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:484
#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Connedit.php:780
#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Settings/Display.php:194
+#: ../../Zotlabs/Module/Settings/Display.php:196
#: ../../Zotlabs/Module/Settings/Features.php:47
#: ../../Zotlabs/Module/Settings/Oauth.php:87
#: ../../Zotlabs/Module/Settings/Tokens.php:167
@@ -751,12 +751,12 @@ msgstr ""
#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15
#: ../../Zotlabs/Lib/ThreadItem.php:725
#: ../../extend/addon/addon/chords/Mod_Chords.php:60
-#: ../../extend/addon/addon/diaspora/diaspora.php:693
+#: ../../extend/addon/addon/diaspora/diaspora.php:698
#: ../../extend/addon/addon/dwpost/dwpost.php:89
#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
#: ../../extend/addon/addon/friendica/friendica.php:128
#: ../../extend/addon/addon/frphotos/frphotos.php:96
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:128
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
#: ../../extend/addon/addon/hubwall/hubwall.php:95
#: ../../extend/addon/addon/ijpost/ijpost.php:89
#: ../../extend/addon/addon/irc/irc.php:53
@@ -850,12 +850,12 @@ msgstr ""
msgid "Search"
msgstr ""
-#: ../../Zotlabs/Module/Search.php:216
+#: ../../Zotlabs/Module/Search.php:223
#, php-format
msgid "Items tagged with: %s"
msgstr ""
-#: ../../Zotlabs/Module/Search.php:218
+#: ../../Zotlabs/Module/Search.php:225
#, php-format
msgid "Search results for: %s"
msgstr ""
@@ -1753,7 +1753,7 @@ msgstr ""
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
#: ../../extend/addon/addon/openid/MysqlProvider.php:56
#: ../../extend/addon/addon/openid/MysqlProvider.php:57
-#: ../../include/network.php:2234
+#: ../../include/network.php:2237
msgid "Email"
msgstr ""
@@ -1957,7 +1957,7 @@ msgid "Default"
msgstr ""
#: ../../Zotlabs/Module/Admin/Site.php:167
-#: ../../Zotlabs/Module/Settings/Display.php:141
+#: ../../Zotlabs/Module/Settings/Display.php:143
msgid "mobile"
msgstr ""
@@ -1976,10 +1976,10 @@ msgstr ""
#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Mitem.php:162
#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Connedit.php:687
#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings/Display.php:101
+#: ../../Zotlabs/Module/Settings/Display.php:103
#: ../../Zotlabs/Module/Settings/Channel.php:289
#: ../../extend/addon/addon/dwpost/dwpost.php:73
#: ../../extend/addon/addon/dwpost/dwpost.php:85
@@ -2043,9 +2043,9 @@ msgstr ""
#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Mitem.php:162
#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings/Display.php:101
+#: ../../Zotlabs/Module/Settings/Display.php:103
#: ../../Zotlabs/Module/Settings/Channel.php:289
#: ../../extend/addon/addon/dwpost/dwpost.php:73
#: ../../extend/addon/addon/dwpost/dwpost.php:85
@@ -2655,7 +2655,7 @@ msgstr ""
#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707
-#: ../../Zotlabs/Module/Events.php:452 ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:453 ../../Zotlabs/Module/Events.php:458
#: ../../include/datetime.php:259
msgid "Required"
msgstr ""
@@ -2664,10 +2664,10 @@ msgstr ""
msgid "Location (URL) of app"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Events.php:466
#: ../../Zotlabs/Module/Rbmark.php:101
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:834
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:137
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:133
msgid "Description"
msgstr ""
@@ -2913,7 +2913,7 @@ msgid "Interests"
msgstr ""
#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:692
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:467
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:468
#: ../../Zotlabs/Module/Pubsites.php:51
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
#: ../../include/js_strings.php:25
@@ -3158,7 +3158,7 @@ msgstr ""
#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051
#: ../../include/event.php:52 ../../include/event.php:84
-#: ../../include/bb2diaspora.php:510
+#: ../../include/bb2diaspora.php:512
msgid "Location:"
msgstr ""
@@ -3351,7 +3351,7 @@ msgstr ""
msgid "Only posts"
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:103
+#: ../../Zotlabs/Module/Channel.php:104
msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
@@ -3520,7 +3520,7 @@ msgstr ""
msgid "status"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:255
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:256
#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:961
#: ../../include/text.php:1987 ../../include/conversation.php:123
msgid "event"
@@ -4022,7 +4022,7 @@ msgstr ""
msgid "Comment"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Events.php:471
#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:734
#: ../../include/page_widgets.php:43 ../../include/conversation.php:1217
msgid "Preview"
@@ -4531,7 +4531,7 @@ msgstr ""
#: ../../Zotlabs/Module/Setup.php:697
#: ../../extend/addon/addon/cdav/cdav.php:40
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:359
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:352
msgid "Errors encountered creating database tables."
msgstr ""
@@ -4544,31 +4544,31 @@ msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
-#: ../../Zotlabs/Module/Network.php:95
+#: ../../Zotlabs/Module/Network.php:96
msgid "No such group"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:135
+#: ../../Zotlabs/Module/Network.php:136
msgid "No such channel"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:140
+#: ../../Zotlabs/Module/Network.php:141
msgid "forum"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:152
+#: ../../Zotlabs/Module/Network.php:153
msgid "Search Results For:"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:218
+#: ../../Zotlabs/Module/Network.php:221
msgid "Privacy group is empty"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:227
+#: ../../Zotlabs/Module/Network.php:230
msgid "Privacy group: "
msgstr ""
-#: ../../Zotlabs/Module/Network.php:253
+#: ../../Zotlabs/Module/Network.php:256
msgid "Invalid connection."
msgstr ""
@@ -4978,88 +4978,88 @@ msgstr ""
msgid "No calendar entries found."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:104
+#: ../../Zotlabs/Module/Events.php:106
msgid "Event can not end before it has started."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:137
+#: ../../Zotlabs/Module/Events.php:108 ../../Zotlabs/Module/Events.php:117
+#: ../../Zotlabs/Module/Events.php:139
msgid "Unable to generate preview."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:113
+#: ../../Zotlabs/Module/Events.php:115
msgid "Event title and start time are required."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:135 ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:261
msgid "Event not found."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:452
+#: ../../Zotlabs/Module/Events.php:453
msgid "Edit event title"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:452
+#: ../../Zotlabs/Module/Events.php:453
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:831
msgid "Event title"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:455
+#: ../../Zotlabs/Module/Events.php:456
msgid "Edit Category"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:455
+#: ../../Zotlabs/Module/Events.php:456
msgid "Category"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459
msgid "Edit start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459
#: ../../extend/addon/addon/cdav/Mod_Cdav.php:832
msgid "Start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463
msgid "Finish date and time are not known or not relevant"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Events.php:462
msgid "Edit finish date and time"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Events.php:462
msgid "Finish date and time"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
+#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
msgid "Adjust for viewer timezone"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:464
msgid ""
"Important for events that happen in a particular place. Not practical for "
"global holidays."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Events.php:466
msgid "Edit Description"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:467
+#: ../../Zotlabs/Module/Events.php:468
msgid "Edit Location"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1280
+#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1280
msgid "Permission settings"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:484
+#: ../../Zotlabs/Module/Events.php:485
msgid "Advanced Options"
msgstr ""
@@ -5141,11 +5141,11 @@ msgstr ""
msgid "g A l F d"
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:334
+#: ../../Zotlabs/Module/Ping.php:330
msgid "[today]"
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:343
+#: ../../Zotlabs/Module/Ping.php:339
msgid "posted an event"
msgstr ""
@@ -6005,108 +6005,116 @@ msgstr ""
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:135
+#: ../../Zotlabs/Module/Settings/Display.php:137
msgid "No special theme for mobile devices"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:138
+#: ../../Zotlabs/Module/Settings/Display.php:140
#, php-format
msgid "%s - (Experimental)"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Zotlabs/Module/Settings/Display.php:191
msgid "Display Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Zotlabs/Module/Settings/Display.php:192
msgid "Theme Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:191
+#: ../../Zotlabs/Module/Settings/Display.php:193
msgid "Custom Theme Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:192
+#: ../../Zotlabs/Module/Settings/Display.php:194
msgid "Content Settings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:198
+#: ../../Zotlabs/Module/Settings/Display.php:200
msgid "Display Theme:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Zotlabs/Module/Settings/Display.php:201
msgid "Select scheme"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Zotlabs/Module/Settings/Display.php:203
msgid "Mobile Theme:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Zotlabs/Module/Settings/Display.php:204
msgid "Preload images before rendering the page"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Zotlabs/Module/Settings/Display.php:204
msgid ""
"The subjective page load time will be longer but the page will be ready when "
"displayed"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Display.php:205
msgid "Enable user zoom on mobile devices"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Zotlabs/Module/Settings/Display.php:206
msgid "Update browser every xx seconds"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Zotlabs/Module/Settings/Display.php:206
msgid "Minimum of 10 seconds, no maximum"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Zotlabs/Module/Settings/Display.php:207
msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Zotlabs/Module/Settings/Display.php:207
msgid "Maximum of 100 items"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Zotlabs/Module/Settings/Display.php:208
msgid "Show emoticons (smilies) as images"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Zotlabs/Module/Settings/Display.php:209
+msgid "Manual conversation updates"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:209
+msgid "Default is automatic, which may increase screen jumping"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:210
msgid "Link post titles to source"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:208
+#: ../../Zotlabs/Module/Settings/Display.php:211
msgid "System Page Layout Editor - (advanced)"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Zotlabs/Module/Settings/Display.php:214
msgid "Use blog/list mode on channel page"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:211
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Zotlabs/Module/Settings/Display.php:214
+#: ../../Zotlabs/Module/Settings/Display.php:215
msgid "(comments displayed separately)"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Zotlabs/Module/Settings/Display.php:215
msgid "Use blog/list mode on grid page"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Zotlabs/Module/Settings/Display.php:216
msgid "Channel page max height of content (in pixels)"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:213
-#: ../../Zotlabs/Module/Settings/Display.php:214
+#: ../../Zotlabs/Module/Settings/Display.php:216
+#: ../../Zotlabs/Module/Settings/Display.php:217
msgid "click to expand content exceeding this height"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:214
+#: ../../Zotlabs/Module/Settings/Display.php:217
msgid "Grid page max height of content (in pixels)"
msgstr ""
@@ -7141,22 +7149,22 @@ msgstr ""
msgid "Video"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1911
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914
msgid "$Projectname Notification"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:61
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46
#: ../../extend/addon/addon/diaspora/util.php:218
#: ../../extend/addon/addon/diaspora/util.php:231
-#: ../../extend/addon/addon/diaspora/p.php:46 ../../include/network.php:1912
+#: ../../include/network.php:1915
msgid "$projectname"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1914
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917
msgid "Thank You,"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1916
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919
#, php-format
msgid "%s Administrator"
msgstr ""
@@ -7471,27 +7479,27 @@ msgstr ""
msgid "Quick Reference"
msgstr ""
-#: ../../extend/addon/addon/diaspora/diaspora.php:658
+#: ../../extend/addon/addon/diaspora/diaspora.php:663
msgid "Diaspora Protocol Settings updated."
msgstr ""
-#: ../../extend/addon/addon/diaspora/diaspora.php:676
+#: ../../extend/addon/addon/diaspora/diaspora.php:681
msgid "Enable the Diaspora protocol for this channel"
msgstr ""
-#: ../../extend/addon/addon/diaspora/diaspora.php:680
+#: ../../extend/addon/addon/diaspora/diaspora.php:685
msgid "Allow any Diaspora member to comment on your public posts"
msgstr ""
-#: ../../extend/addon/addon/diaspora/diaspora.php:684
+#: ../../extend/addon/addon/diaspora/diaspora.php:689
msgid "Prevent your hashtags from being redirected to other sites"
msgstr ""
-#: ../../extend/addon/addon/diaspora/diaspora.php:688
+#: ../../extend/addon/addon/diaspora/diaspora.php:693
msgid "Followed hashtags (comma separated, do not include the #)"
msgstr ""
-#: ../../extend/addon/addon/diaspora/diaspora.php:693
+#: ../../extend/addon/addon/diaspora/diaspora.php:698
msgid "Diaspora Protocol Settings"
msgstr ""
@@ -7972,7 +7980,7 @@ msgid "Add a personal note:"
msgstr ""
#: ../../extend/addon/addon/friendica/dfrn_request.php:871
-#: ../../include/network.php:2229 ../../include/network.php:2230
+#: ../../include/network.php:2232 ../../include/network.php:2233
msgid "Friendica"
msgstr ""
@@ -7981,7 +7989,7 @@ msgid "StatusNet/Federated Social Web"
msgstr ""
#: ../../extend/addon/addon/friendica/dfrn_request.php:873
-#: ../../include/network.php:2235
+#: ../../include/network.php:2238
msgid "Diaspora"
msgstr ""
@@ -8001,7 +8009,7 @@ msgid "Submit Request"
msgstr ""
#: ../../extend/addon/addon/friendica/friendica.php:113
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:113
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:114
msgid "GNU-Social Protocol Settings updated."
msgstr ""
@@ -8010,17 +8018,17 @@ msgid "Enable the (experimental) GNU-Social protocol for this channel"
msgstr ""
#: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:128
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
msgid "GNU-Social Protocol Settings"
msgstr ""
#: ../../extend/addon/addon/friendica/friendica.php:185
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:317
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:319
msgid "Follow"
msgstr ""
#: ../../extend/addon/addon/friendica/friendica.php:188
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:320
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:322
#, php-format
msgid "%1$s is now following %2$s"
msgstr ""
@@ -8045,7 +8053,7 @@ msgstr ""
msgid "Friendica Login Password"
msgstr ""
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:124
+#: ../../extend/addon/addon/gnusoc/gnusoc.php:125
msgid "Enable the GNU-Social protocol for this channel"
msgstr ""
@@ -10191,77 +10199,70 @@ msgstr ""
#: ../../extend/addon/addon/rendezvous/rendezvous.php:127
msgid ""
-"This identity has been deleted by another member due to inactivity. \n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tPlease press the \"New identity"
-"\" button or refresh the page to \n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tregister a new identity. You may "
-"use the same name."
+"This identity has been deleted by another member due to inactivity. Please "
+"press the \"New identity\" button or refresh the page to register a new "
+"identity. You may use the same name."
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:130
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:128
msgid "Welcome to Rendezvous!"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:131
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:129
msgid ""
"Enter your name to join this rendezvous. To begin sharing your location with "
-"the other\n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tmembers, tap the GPS control. "
-"When your location is discovered, a red dot will appear\n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tand others will be able to see "
-"you on the map."
+"the other members, tap the GPS control. When your location is discovered, a "
+"red dot will appear and others will be able to see you on the map."
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:135
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:131
msgid "Let's meet here"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:138
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:134
msgid "New marker"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:139
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:135
msgid "Edit marker"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:140
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:136
msgid "New identity"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:141
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:137
msgid "Delete marker"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:142
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:138
msgid "Delete member"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:143
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:139
msgid "Edit proximity alert"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:144
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:140
msgid ""
"A proximity alert will be issued when this member is within a certain radius "
-"of you.<br><br>Enter a radius in meters:"
+"of you.<br><br>Enter a radius in meters (0 to disable):"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:144
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:140
msgid "distance"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:154
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:150
msgid "Add new rendezvous"
msgstr ""
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:155
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:151
msgid ""
-"Create a new rendezvous and share the access link with those you wish \n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tto invite to the group. Those who open the "
-"link become members of the \n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\trendezvous. They can view other member "
-"locations, add markers to the map,\n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tor share their own locations with the group."
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or "
+"share their own locations with the group."
msgstr ""
#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44
@@ -10712,17 +10713,17 @@ msgid ""
msgstr ""
#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:488
+#: ../../include/bb2diaspora.php:490
msgid "l F d, Y \\@ g:i A"
msgstr ""
#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:494
+#: ../../include/bb2diaspora.php:496
msgid "Starts:"
msgstr ""
#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:502
+#: ../../include/bb2diaspora.php:504
msgid "Finishes:"
msgstr ""
@@ -10754,89 +10755,95 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../include/items.php:909 ../../include/items.php:954
-msgid "(Unknown)"
+#: ../../include/message.php:20
+msgid "No recipient provided."
msgstr ""
-#: ../../include/items.php:1152
-msgid "Visible to anybody on the internet."
+#: ../../include/message.php:25
+msgid "[no subject]"
msgstr ""
-#: ../../include/items.php:1154
-msgid "Visible to you only."
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
msgstr ""
-#: ../../include/items.php:1156
-msgid "Visible to anybody in this network."
+#: ../../include/message.php:223
+msgid "Stored post could not be verified."
msgstr ""
-#: ../../include/items.php:1158
-msgid "Visible to anybody authenticated."
+#: ../../include/photos.php:115
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
-#: ../../include/items.php:1160
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/photos.php:122
+msgid "Image file is empty."
msgstr ""
-#: ../../include/items.php:1162
-msgid "Visible to all connections."
+#: ../../include/photos.php:260
+msgid "Photo storage failed."
msgstr ""
-#: ../../include/items.php:1164
-msgid "Visible to approved connections."
+#: ../../include/photos.php:300
+msgid "a new photo"
msgstr ""
-#: ../../include/items.php:1166
-msgid "Visible to specific connections."
+#: ../../include/photos.php:304
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
msgstr ""
-#: ../../include/items.php:3960
-msgid "Privacy group is empty."
+#: ../../include/photos.php:507 ../../include/conversation.php:1696
+msgid "Photo Albums"
msgstr ""
-#: ../../include/items.php:3967
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/photos.php:511
+msgid "Upload New Photos"
msgstr ""
-#: ../../include/items.php:3979
-msgid "Connection not found."
+#: ../../include/network.php:729
+msgid "view full size"
msgstr ""
-#: ../../include/items.php:4332
-msgid "profile photo"
+#: ../../include/network.php:1962
+msgid "Administrator"
msgstr ""
-#: ../../include/items.php:4528
-#, php-format
-msgid "[Edited %s]"
+#: ../../include/network.php:1978
+msgid "No Subject"
msgstr ""
-#: ../../include/items.php:4528
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../include/network.php:2234
+msgid "OStatus"
msgstr ""
-#: ../../include/items.php:4528
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../include/network.php:2235
+msgid "GNU-Social"
msgstr ""
-#: ../../include/message.php:20
-msgid "No recipient provided."
+#: ../../include/network.php:2236
+msgid "RSS/Atom"
msgstr ""
-#: ../../include/message.php:25
-msgid "[no subject]"
+#: ../../include/network.php:2239
+msgid "Facebook"
msgstr ""
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/network.php:2240
+msgid "Zot"
msgstr ""
-#: ../../include/message.php:223
-msgid "Stored post could not be verified."
+#: ../../include/network.php:2241
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:2242
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:2243
+msgid "MySpace"
msgstr ""
#: ../../include/features.php:58
@@ -11141,81 +11148,6 @@ msgid ""
"channel"
msgstr ""
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:122
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:300
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:304
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:507 ../../include/conversation.php:1696
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/photos.php:511
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../include/network.php:726
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1959
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/network.php:1975
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:2231
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:2232
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:2233
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:2236
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:2237
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:2238
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:2239
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:2240
-msgid "MySpace"
-msgstr ""
-
#: ../../include/bookmarks.php:35
#, php-format
msgid "%1$s's bookmarks"
@@ -11410,7 +11342,7 @@ msgstr ""
msgid "New Page"
msgstr ""
-#: ../../include/wiki.php:525 ../../include/bbcode.php:633
+#: ../../include/wiki.php:525 ../../include/bbcode.php:632
msgid "Different viewers will see this text differently"
msgstr ""
@@ -11909,6 +11841,75 @@ msgstr ""
msgid "Empty path"
msgstr ""
+#: ../../include/items.php:909 ../../include/items.php:954
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1152
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1154
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1156
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1158
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1160
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1162
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1164
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1166
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3960
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3967
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3979
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4332
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/items.php:4528
+#, php-format
+msgid "[Edited %s]"
+msgstr ""
+
+#: ../../include/items.php:4528
+msgctxt "edit_activity"
+msgid "Post"
+msgstr ""
+
+#: ../../include/items.php:4528
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr ""
+
#: ../../include/auth.php:148
msgid "Logged out."
msgstr ""
@@ -12218,7 +12219,7 @@ msgstr ""
msgid "Attachments:"
msgstr ""
-#: ../../include/bb2diaspora.php:490
+#: ../../include/bb2diaspora.php:492
msgid "$Projectname event notification:"
msgstr ""
@@ -13026,17 +13027,17 @@ msgstr ""
msgid "Unable to import element \""
msgstr ""
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:902
-#: ../../include/bbcode.php:905 ../../include/bbcode.php:910
-#: ../../include/bbcode.php:913 ../../include/bbcode.php:916
-#: ../../include/bbcode.php:919 ../../include/bbcode.php:924
-#: ../../include/bbcode.php:927 ../../include/bbcode.php:932
-#: ../../include/bbcode.php:935 ../../include/bbcode.php:938
-#: ../../include/bbcode.php:941
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:901
+#: ../../include/bbcode.php:904 ../../include/bbcode.php:909
+#: ../../include/bbcode.php:912 ../../include/bbcode.php:915
+#: ../../include/bbcode.php:918 ../../include/bbcode.php:923
+#: ../../include/bbcode.php:926 ../../include/bbcode.php:931
+#: ../../include/bbcode.php:934 ../../include/bbcode.php:937
+#: ../../include/bbcode.php:940
msgid "Image/photo"
msgstr ""
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:952
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:951
msgid "Encrypted content"
msgstr ""
@@ -13065,7 +13066,7 @@ msgstr ""
msgid "spoiler"
msgstr ""
-#: ../../include/bbcode.php:890
+#: ../../include/bbcode.php:889
msgid "$1 wrote:"
msgstr ""