aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-28 05:05:34 -0700
committerfriendica <info@friendica.com>2014-06-28 05:05:34 -0700
commit0074ef0bf3cea83b1a177e905222829db26504b6 (patch)
tree8adf389e73866f737f5e0ee03585a2048d574859
parent532b6f7fcecba569885ccc884969955e32c24135 (diff)
downloadvolse-hubzilla-0074ef0bf3cea83b1a177e905222829db26504b6.tar.gz
volse-hubzilla-0074ef0bf3cea83b1a177e905222829db26504b6.tar.bz2
volse-hubzilla-0074ef0bf3cea83b1a177e905222829db26504b6.zip
rule of snakes #1, kill the snake.
tinymce is gone. if you want a visual editor, figure out what you want and make it happen. If you don't want a visual editor, do nothing. This is in the community's hands. I don't need a visual editor.
-rw-r--r--include/conversation.php4
-rw-r--r--mod/editblock.php4
-rw-r--r--mod/editlayout.php4
-rw-r--r--mod/editwebpage.php4
-rwxr-xr-xmod/events.php4
-rw-r--r--mod/item.php12
-rw-r--r--mod/mail.php17
-rw-r--r--mod/profiles.php4
-rw-r--r--mod/rpost.php4
-rw-r--r--util/messages.po934
-rw-r--r--version.inc2
11 files changed, 528 insertions, 465 deletions
diff --git a/include/conversation.php b/include/conversation.php
index d8d60ee10..b6db54943 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1029,8 +1029,8 @@ function status_editor($a,$x,$popup=false) {
$plaintext = true;
- if(feature_enabled(local_user(),'richtext'))
- $plaintext = false;
+// if(feature_enabled(local_user(),'richtext'))
+// $plaintext = false;
$mimeselect = '';
if(array_key_exists('mimetype',$x) && $x['mimetype']) {
diff --git a/mod/editblock.php b/mod/editblock.php
index 507050eb0..536ddd7d2 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -58,8 +58,8 @@ function editblock_content(&$a) {
$plaintext = true;
// You may or may not be a local user.
- if(local_user() && feature_enabled(local_user(),'richtext'))
- $plaintext = false;
+// if(local_user() && feature_enabled(local_user(),'richtext'))
+// $plaintext = false;
$mimeselect = '';
$mimetype = $itm[0]['mimetype'];
diff --git a/mod/editlayout.php b/mod/editlayout.php
index da681cf34..1e8a6e990 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -65,8 +65,8 @@ function editlayout_content(&$a) {
$plaintext = true;
// You may or may not be a local user. This won't work,
- if(feature_enabled(local_user(),'richtext'))
- $plaintext = false;
+// if(feature_enabled(local_user(),'richtext'))
+// $plaintext = false;
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Layout')
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index b8b7a465c..9fe76ba98 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -73,8 +73,8 @@ function editwebpage_content(&$a) {
$plaintext = true;
- if(feature_enabled($itm[0]['uid'],'richtext'))
- $plaintext = false;
+// if(feature_enabled($itm[0]['uid'],'richtext'))
+// $plaintext = false;
$mimetype = $itm[0]['mimetype'];
diff --git a/mod/events.php b/mod/events.php
index 911b6c891..7c4d6c191 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -161,8 +161,8 @@ function events_content(&$a) {
$plaintext = true;
- if(feature_enabled(local_user(),'richtext'))
- $plaintext = false;
+// if(feature_enabled(local_user(),'richtext'))
+// $plaintext = false;
diff --git a/mod/item.php b/mod/item.php
index 693c64eca..c9ec56eeb 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -430,10 +430,14 @@ function item_post(&$a) {
// First figure out if it's a status post that would've been
// created using tinymce. Otherwise leave it alone.
- $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
- if((! $parent) && (! $api_source) && (! $plaintext)) {
- $body = fix_mce_lf($body);
- }
+ $plaintext = true;
+
+// $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
+// if((! $parent) && (! $api_source) && (! $plaintext)) {
+// $body = fix_mce_lf($body);
+// }
+
+
// If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set.
diff --git a/mod/mail.php b/mod/mail.php
index 9c84872ef..c3ce47b5a 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -76,9 +76,9 @@ function mail_post(&$a) {
}
}
- if(feature_enabled(local_user(),'richtext')) {
- $body = fix_mce_lf($body);
- }
+// if(feature_enabled(local_user(),'richtext')) {
+// $body = fix_mce_lf($body);
+// }
if(! $recipient) {
notice('No recipient found.');
@@ -156,11 +156,7 @@ function mail_content(&$a) {
$o .= $header;
- $plaintext = false;
- if(intval(get_pconfig(local_user(),'system','plaintext')))
- $plaintext = true;
- if(! feature_enabled(local_user(),'richtext'))
- $plaintext = true;
+ $plaintext = true;
$tpl = get_markup_template('msg-header.tpl');
@@ -240,8 +236,9 @@ function mail_content(&$a) {
$o .= $header;
$plaintext = true;
- if( local_user() && feature_enabled(local_user(),'richtext') )
- $plaintext = false;
+
+// if( local_user() && feature_enabled(local_user(),'richtext') )
+// $plaintext = false;
$messages = private_messages_fetch_conversation(local_user(), argv(1), true);
diff --git a/mod/profiles.php b/mod/profiles.php
index 2e91db600..f6392d4ab 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -477,8 +477,8 @@ function profiles_content(&$a) {
$editselect = 'none';
- if(feature_enabled(local_user(),'richtext'))
- $editselect = 'textareas';
+// if(feature_enabled(local_user(),'richtext'))
+// $editselect = 'textareas';
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
'$baseurl' => $a->get_baseurl(true),
diff --git a/mod/rpost.php b/mod/rpost.php
index 309208870..80406ebef 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -83,8 +83,8 @@ function rpost_content(&$a) {
}
$plaintext = true;
- if(feature_enabled(local_user(),'richtext'))
- $plaintext = false;
+// if(feature_enabled(local_user(),'richtext'))
+// $plaintext = false;
if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') {
require_once('include/html2bbcode.php');
diff --git a/util/messages.po b/util/messages.po
index 7e314e083..d63bcc5ab 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2014-06-20.712\n"
+"Project-Id-Version: 2014-06-27.719\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 00:03-0700\n"
+"POT-Creation-Date: 2014-06-27 00:02-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"
@@ -77,504 +77,506 @@ msgstr ""
msgid "commented on %s's post"
msgstr ""
-#: ../../include/conversation.php:117 ../../include/text.php:1705
+#: ../../include/conversation.php:120 ../../include/text.php:1705
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:45 ../../mod/like.php:111
+#: ../../mod/tagger.php:45 ../../mod/like.php:254
msgid "photo"
msgstr ""
-#: ../../include/conversation.php:120 ../../include/text.php:1708
+#: ../../include/conversation.php:123 ../../include/text.php:1708
#: ../../mod/tagger.php:49
msgid "event"
msgstr ""
-#: ../../include/conversation.php:123
+#: ../../include/conversation.php:126 ../../mod/like.php:72
msgid "channel"
msgstr ""
-#: ../../include/conversation.php:145 ../../include/text.php:1711
+#: ../../include/conversation.php:148 ../../include/text.php:1711
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:53 ../../mod/like.php:111
+#: ../../mod/tagger.php:53 ../../mod/like.php:254
msgid "status"
msgstr ""
-#: ../../include/conversation.php:147 ../../include/text.php:1713
+#: ../../include/conversation.php:150 ../../include/text.php:1713
#: ../../mod/tagger.php:55
msgid "comment"
msgstr ""
-#: ../../include/conversation.php:161 ../../mod/like.php:142
+#: ../../include/conversation.php:164 ../../mod/like.php:291
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr ""
-#: ../../include/conversation.php:164 ../../mod/like.php:144
+#: ../../include/conversation.php:167 ../../mod/like.php:293
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
-#: ../../include/conversation.php:201
+#: ../../include/conversation.php:204
#, php-format
msgid "%1$s is now connected with %2$s"
msgstr ""
-#: ../../include/conversation.php:236
+#: ../../include/conversation.php:239
#, php-format
msgid "%1$s poked %2$s"
msgstr ""
-#: ../../include/conversation.php:240 ../../include/text.php:895
+#: ../../include/conversation.php:243 ../../include/text.php:895
msgid "poked"
msgstr ""
-#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#: ../../include/conversation.php:261 ../../mod/mood.php:63
#, php-format
msgctxt "mood"
msgid "%1$s is %2$s"
msgstr ""
-#: ../../include/conversation.php:631 ../../include/ItemObject.php:114
+#: ../../include/conversation.php:634 ../../include/ItemObject.php:114
msgid "Select"
msgstr ""
-#: ../../include/conversation.php:632 ../../include/apps.php:232
+#: ../../include/conversation.php:635 ../../include/apps.php:232
#: ../../include/ItemObject.php:108 ../../mod/settings.php:578
-#: ../../mod/connedit.php:398 ../../mod/filestorage.php:175
-#: ../../mod/group.php:176 ../../mod/admin.php:758 ../../mod/admin.php:887
-#: ../../mod/thing.php:236 ../../mod/photos.php:1041
+#: ../../mod/connedit.php:398 ../../mod/photos.php:1046
+#: ../../mod/group.php:176 ../../mod/admin.php:758 ../../mod/admin.php:888
+#: ../../mod/thing.php:236
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:84
msgid "Delete"
msgstr ""
-#: ../../include/conversation.php:639 ../../include/ItemObject.php:89
+#: ../../include/conversation.php:642 ../../include/ItemObject.php:89
#: ../../mod/photos.php:844
msgid "Private Message"
msgstr ""
-#: ../../include/conversation.php:646 ../../include/ItemObject.php:182
+#: ../../include/conversation.php:649 ../../include/ItemObject.php:182
msgid "Message is verified"
msgstr ""
-#: ../../include/conversation.php:666
+#: ../../include/conversation.php:669
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
-#: ../../include/conversation.php:680
+#: ../../include/conversation.php:683
msgid "Categories:"
msgstr ""
-#: ../../include/conversation.php:681
+#: ../../include/conversation.php:684
msgid "Filed under:"
msgstr ""
-#: ../../include/conversation.php:690 ../../include/ItemObject.php:250
+#: ../../include/conversation.php:693 ../../include/ItemObject.php:250
#, php-format
msgid " from %s"
msgstr ""
-#: ../../include/conversation.php:693 ../../include/ItemObject.php:253
+#: ../../include/conversation.php:696 ../../include/ItemObject.php:253
#, php-format
msgid "last edited: %s"
msgstr ""
-#: ../../include/conversation.php:694 ../../include/ItemObject.php:254
+#: ../../include/conversation.php:697 ../../include/ItemObject.php:254
#, php-format
msgid "Expires: %s"
msgstr ""
-#: ../../include/conversation.php:709
+#: ../../include/conversation.php:712
msgid "View in context"
msgstr ""
-#: ../../include/conversation.php:711 ../../include/conversation.php:1127
+#: ../../include/conversation.php:714 ../../include/conversation.php:1130
#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120
#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121
-#: ../../mod/editwebpage.php:152 ../../mod/mail.php:222 ../../mod/mail.php:336
-#: ../../mod/photos.php:972
+#: ../../mod/editwebpage.php:152 ../../mod/photos.php:977
+#: ../../mod/mail.php:222 ../../mod/mail.php:336
msgid "Please wait"
msgstr ""
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:841
msgid "remove"
msgstr ""
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:845
msgid "Loading..."
msgstr ""
-#: ../../include/conversation.php:843
+#: ../../include/conversation.php:846
msgid "Delete Selected Items"
msgstr ""
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:937
msgid "View Source"
msgstr ""
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:938
msgid "Follow Thread"
msgstr ""
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:939
msgid "View Status"
msgstr ""
-#: ../../include/conversation.php:937 ../../include/nav.php:81
+#: ../../include/conversation.php:940 ../../include/nav.php:81
#: ../../mod/connedit.php:351 ../../mod/connedit.php:465
msgid "View Profile"
msgstr ""
-#: ../../include/conversation.php:938
+#: ../../include/conversation.php:941
msgid "View Photos"
msgstr ""
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:942
msgid "Matrix Activity"
msgstr ""
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:943
msgid "Edit Contact"
msgstr ""
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:944
msgid "Send PM"
msgstr ""
-#: ../../include/conversation.php:942 ../../include/apps.php:135
+#: ../../include/conversation.php:945 ../../include/apps.php:135
msgid "Poke"
msgstr ""
-#: ../../include/conversation.php:998
+#: ../../include/conversation.php:1001
#, php-format
msgid "%s likes this."
msgstr ""
-#: ../../include/conversation.php:998
+#: ../../include/conversation.php:1001
#, php-format
msgid "%s doesn't like this."
msgstr ""
-#: ../../include/conversation.php:1002
+#: ../../include/conversation.php:1005
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgid_plural "<span %1$s>%2$d people</span> like this."
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1004
+#: ../../include/conversation.php:1007
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgid_plural "<span %1$s>%2$d people</span> don't like this."
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1010
+#: ../../include/conversation.php:1013
msgid "and"
msgstr ""
-#: ../../include/conversation.php:1013
+#: ../../include/conversation.php:1016
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1014
+#: ../../include/conversation.php:1017
#, php-format
msgid "%s like this."
msgstr ""
-#: ../../include/conversation.php:1014
+#: ../../include/conversation.php:1017
#, php-format
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1074
msgid "Visible to <strong>everybody</strong>"
msgstr ""
-#: ../../include/conversation.php:1072 ../../mod/mail.php:171
+#: ../../include/conversation.php:1075 ../../mod/mail.php:171
#: ../../mod/mail.php:269
msgid "Please enter a link URL:"
msgstr ""
-#: ../../include/conversation.php:1073
+#: ../../include/conversation.php:1076
msgid "Please enter a video link/URL:"
msgstr ""
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1077
msgid "Please enter an audio link/URL:"
msgstr ""
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:1076 ../../mod/filer.php:49
+#: ../../include/conversation.php:1079 ../../mod/filer.php:49
msgid "Save to Folder:"
msgstr ""
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1080
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1078 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1081 ../../mod/editpost.php:52
#: ../../mod/mail.php:172 ../../mod/mail.php:270
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../include/conversation.php:1088 ../../include/page_widgets.php:40
+#: ../../include/conversation.php:1091 ../../include/page_widgets.php:40
#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141
#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
-#: ../../mod/editwebpage.php:174 ../../mod/webpages.php:124
-#: ../../mod/photos.php:992
+#: ../../mod/editwebpage.php:174 ../../mod/photos.php:997
+#: ../../mod/webpages.php:124
msgid "Preview"
msgstr ""
-#: ../../include/conversation.php:1102 ../../mod/layouts.php:113
-#: ../../mod/photos.php:971
+#: ../../include/conversation.php:1105 ../../mod/photos.php:976
+#: ../../mod/layouts.php:113
msgid "Share"
msgstr ""
-#: ../../include/conversation.php:1104 ../../mod/editwebpage.php:139
+#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139
msgid "Page link title"
msgstr ""
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1110
msgid "Post as"
msgstr ""
-#: ../../include/conversation.php:1108 ../../mod/editblock.php:112
+#: ../../include/conversation.php:1111 ../../mod/editblock.php:112
#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113
#: ../../mod/editwebpage.php:144 ../../mod/mail.php:219 ../../mod/mail.php:332
msgid "Upload photo"
msgstr ""
-#: ../../include/conversation.php:1109
+#: ../../include/conversation.php:1112
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1110 ../../mod/editblock.php:113
+#: ../../include/conversation.php:1113 ../../mod/editblock.php:113
#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114
#: ../../mod/editwebpage.php:145 ../../mod/mail.php:220 ../../mod/mail.php:333
msgid "Attach file"
msgstr ""
-#: ../../include/conversation.php:1111
+#: ../../include/conversation.php:1114
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1112 ../../mod/editblock.php:114
+#: ../../include/conversation.php:1115 ../../mod/editblock.php:114
#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115
#: ../../mod/editwebpage.php:146 ../../mod/mail.php:221 ../../mod/mail.php:334
msgid "Insert web link"
msgstr ""
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1116
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:1114
+#: ../../include/conversation.php:1117
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:1115
+#: ../../include/conversation.php:1118
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:1116
+#: ../../include/conversation.php:1119
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:1117
+#: ../../include/conversation.php:1120
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1118 ../../mod/editblock.php:118
+#: ../../include/conversation.php:1121 ../../mod/editblock.php:118
#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119
#: ../../mod/editwebpage.php:150
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1119
+#: ../../include/conversation.php:1122
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1120 ../../mod/editblock.php:119
+#: ../../include/conversation.php:1123 ../../mod/editblock.php:119
#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120
#: ../../mod/editwebpage.php:151
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1121
+#: ../../include/conversation.php:1124
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1123 ../../mod/editblock.php:132
+#: ../../include/conversation.php:1126 ../../mod/editblock.php:132
#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132
#: ../../mod/editwebpage.php:167
msgid "Set title"
msgstr ""
-#: ../../include/conversation.php:1126 ../../mod/editblock.php:135
+#: ../../include/conversation.php:1129 ../../mod/editblock.php:135
#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134
#: ../../mod/editwebpage.php:169
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1128 ../../mod/editblock.php:121
+#: ../../include/conversation.php:1131 ../../mod/editblock.php:121
#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122
#: ../../mod/editwebpage.php:153
msgid "Permission settings"
msgstr ""
-#: ../../include/conversation.php:1129
+#: ../../include/conversation.php:1132
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1136 ../../mod/editblock.php:129
+#: ../../include/conversation.php:1139 ../../mod/editblock.php:129
#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129
#: ../../mod/editwebpage.php:162
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1138 ../../mod/editblock.php:136
+#: ../../include/conversation.php:1141 ../../mod/editblock.php:136
#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135
#: ../../mod/editwebpage.php:170
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
-#: ../../include/conversation.php:1151 ../../mod/editblock.php:146
+#: ../../include/conversation.php:1154 ../../mod/editblock.php:146
#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146
#: ../../mod/editwebpage.php:179 ../../mod/mail.php:226 ../../mod/mail.php:339
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1153 ../../include/ItemObject.php:595
+#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595
#: ../../mod/editpost.php:148 ../../mod/mail.php:228 ../../mod/mail.php:341
msgid "Encrypt text"
msgstr ""
-#: ../../include/conversation.php:1155 ../../mod/editpost.php:150
+#: ../../include/conversation.php:1158 ../../mod/editpost.php:150
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1156 ../../mod/settings.php:516
+#: ../../include/conversation.php:1159 ../../mod/settings.php:516
#: ../../mod/settings.php:542 ../../mod/editpost.php:151
#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11
#: ../../mod/tagrm.php:94
msgid "Cancel"
msgstr ""
-#: ../../include/conversation.php:1398
+#: ../../include/conversation.php:1401
msgid "Discover"
msgstr ""
-#: ../../include/conversation.php:1401
+#: ../../include/conversation.php:1404
msgid "Imported public streams"
msgstr ""
-#: ../../include/conversation.php:1406
+#: ../../include/conversation.php:1409
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1409
+#: ../../include/conversation.php:1412
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1413
+#: ../../include/conversation.php:1416
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1416
+#: ../../include/conversation.php:1419
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1421 ../../include/widgets.php:82
+#: ../../include/conversation.php:1424 ../../include/widgets.php:82
msgid "Personal"
msgstr ""
-#: ../../include/conversation.php:1424
+#: ../../include/conversation.php:1427
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1430 ../../mod/connections.php:211
+#: ../../include/conversation.php:1433 ../../mod/connections.php:211
#: ../../mod/connections.php:224 ../../mod/menu.php:61
msgid "New"
msgstr ""
-#: ../../include/conversation.php:1433
+#: ../../include/conversation.php:1436
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1439
+#: ../../include/conversation.php:1442
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1442
+#: ../../include/conversation.php:1445
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1449
+#: ../../include/conversation.php:1452
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1452
+#: ../../include/conversation.php:1455
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1486 ../../mod/admin.php:891
+#: ../../include/conversation.php:1488 ../../mod/admin.php:892
msgid "Channel"
msgstr ""
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1491
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1498
+#: ../../include/conversation.php:1500
msgid "About"
msgstr ""
-#: ../../include/conversation.php:1501
+#: ../../include/conversation.php:1503
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1507 ../../include/nav.php:84
+#: ../../include/conversation.php:1509 ../../include/nav.php:84
#: ../../include/apps.php:129 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr ""
-#: ../../include/conversation.php:1510 ../../include/photos.php:313
+#: ../../include/conversation.php:1512 ../../include/photos.php:313
msgid "Photo Albums"
msgstr ""
-#: ../../include/conversation.php:1516 ../../include/nav.php:85
-#: ../../include/apps.php:125 ../../mod/fbrowser.php:114
+#: ../../include/conversation.php:1518 ../../include/nav.php:85
+#: ../../include/reddav.php:1051 ../../include/apps.php:125
+#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr ""
-#: ../../include/conversation.php:1519
+#: ../../include/conversation.php:1521
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1528 ../../include/conversation.php:1531
+#: ../../include/conversation.php:1530 ../../include/conversation.php:1533
msgid "Chatrooms"
msgstr ""
-#: ../../include/conversation.php:1538 ../../include/nav.php:93
+#: ../../include/conversation.php:1540 ../../include/nav.php:93
#: ../../include/apps.php:119
msgid "Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1543
msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1549 ../../include/nav.php:95
+#: ../../include/conversation.php:1551 ../../include/nav.php:95
#: ../../include/apps.php:126 ../../mod/webpages.php:79
msgid "Webpages"
msgstr ""
-#: ../../include/conversation.php:1552
+#: ../../include/conversation.php:1554
msgid "Manage Webpages"
msgstr ""
@@ -588,8 +590,9 @@ msgstr ""
#: ../../mod/blocks.php:94 ../../mod/connections.php:393
#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106
#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143
-#: ../../mod/filestorage.php:174 ../../mod/thing.php:235
-#: ../../mod/layouts.php:112 ../../mod/menu.php:59 ../../mod/webpages.php:120
+#: ../../mod/thing.php:235 ../../mod/layouts.php:112 ../../mod/menu.php:59
+#: ../../mod/webpages.php:120
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:80
msgid "Edit"
msgstr ""
@@ -685,7 +688,7 @@ msgstr ""
#: ../../include/attach.php:243 ../../include/attach.php:283
#: ../../include/attach.php:297 ../../include/attach.php:322
#: ../../include/attach.php:513 ../../include/attach.php:585
-#: ../../include/chat.php:116 ../../include/items.php:3679
+#: ../../include/chat.php:116 ../../include/items.php:3680
#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27
#: ../../mod/settings.php:492 ../../mod/poke.php:128 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64
@@ -701,19 +704,19 @@ msgstr ""
#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34
#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48
#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/sources.php:66
-#: ../../mod/events.php:141 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
-#: ../../mod/filestorage.php:98 ../../mod/fsuggest.php:78
-#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/thing.php:247
-#: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/item.php:179 ../../mod/item.php:187
-#: ../../mod/item.php:894 ../../mod/layouts.php:27 ../../mod/layouts.php:39
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6
-#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16
+#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68
+#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:141
+#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59
+#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98
+#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9
+#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301
+#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:179
+#: ../../mod/item.php:187 ../../mod/item.php:898 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:12
+#: ../../mod/mail.php:108 ../../mod/manage.php:6 ../../mod/menu.php:44
+#: ../../mod/webpages.php:40 ../../mod/message.php:16
#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/photos.php:68 ../../mod/photos.php:526
#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186
#: ../../index.php:361
msgid "Permission denied."
@@ -737,7 +740,7 @@ msgid "Photo storage failed."
msgstr ""
#: ../../include/photos.php:317 ../../mod/photos.php:691
-#: ../../mod/photos.php:1188
+#: ../../mod/photos.php:1193
msgid "Upload New Photos"
msgstr ""
@@ -754,8 +757,8 @@ msgid "Don't show"
msgstr ""
#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209
-#: ../../mod/filestorage.php:126 ../../mod/photos.php:604
-#: ../../mod/photos.php:947
+#: ../../mod/photos.php:604 ../../mod/photos.php:952
+#: ../../mod/filestorage.php:128
msgid "Permissions"
msgstr ""
@@ -866,7 +869,7 @@ msgstr ""
msgid "Location:"
msgstr ""
-#: ../../include/nav.php:77 ../../include/nav.php:101 ../../boot.php:1456
+#: ../../include/nav.php:77 ../../include/nav.php:101 ../../boot.php:1464
msgid "Logout"
msgstr ""
@@ -918,7 +921,7 @@ msgstr ""
msgid "Your webpages"
msgstr ""
-#: ../../include/nav.php:99 ../../include/apps.php:121 ../../boot.php:1457
+#: ../../include/nav.php:99 ../../include/apps.php:121 ../../boot.php:1465
msgid "Login"
msgstr ""
@@ -939,7 +942,7 @@ msgstr ""
msgid "Home Page"
msgstr ""
-#: ../../include/nav.php:139 ../../mod/register.php:206 ../../boot.php:1433
+#: ../../include/nav.php:139 ../../mod/register.php:206 ../../boot.php:1441
msgid "Register"
msgstr ""
@@ -1082,8 +1085,8 @@ msgid "Manage Your Channels"
msgstr ""
#: ../../include/nav.php:191 ../../include/apps.php:124
-#: ../../include/widgets.php:514 ../../mod/admin.php:977
-#: ../../mod/admin.php:1182
+#: ../../include/widgets.php:514 ../../mod/admin.php:978
+#: ../../mod/admin.php:1183
msgid "Settings"
msgstr ""
@@ -1172,6 +1175,14 @@ msgstr ""
msgid "dislikes"
msgstr ""
+#: ../../include/taxonomy.php:338 ../../include/identity.php:968
+#: ../../include/ItemObject.php:134
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185
#: ../../view/theme/redbasic/php/config.php:84
msgid "Default"
@@ -1238,7 +1249,7 @@ msgid "RSS/Atom"
msgstr ""
#: ../../include/contact_selectors.php:77 ../../mod/admin.php:754
-#: ../../mod/admin.php:763 ../../boot.php:1459
+#: ../../mod/admin.php:763 ../../boot.php:1467
msgid "Email"
msgstr ""
@@ -1347,10 +1358,6 @@ msgstr ""
msgid "This event has been added to your calendar."
msgstr ""
-#: ../../include/reddav.php:1045
-msgid "Edit File properties"
-msgstr ""
-
#: ../../include/datetime.php:43 ../../include/datetime.php:45
msgid "Miscellaneous"
msgstr ""
@@ -1653,6 +1660,63 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
+#: ../../include/reddav.php:915
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:52
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:55
+msgid "parent"
+msgstr ""
+
+#: ../../include/reddav.php:940
+msgid "Collection"
+msgstr ""
+
+#: ../../include/reddav.php:943
+msgid "Principal"
+msgstr ""
+
+#: ../../include/reddav.php:946
+msgid "Addressbook"
+msgstr ""
+
+#: ../../include/reddav.php:949
+msgid "Calendar"
+msgstr ""
+
+#: ../../include/reddav.php:952
+msgid "Schedule Inbox"
+msgstr ""
+
+#: ../../include/reddav.php:955
+msgid "Schedule Outbox"
+msgstr ""
+
+#: ../../include/reddav.php:1033
+#, php-format
+msgid "%1$s used"
+msgstr ""
+
+#: ../../include/reddav.php:1038
+#, php-format
+msgid "%1$s used of %2$s (%3$s&#37;)"
+msgstr ""
+
+#: ../../include/reddav.php:1104
+msgid "Create new folder"
+msgstr ""
+
+#: ../../include/reddav.php:1107 ../../mod/mitem.php:142 ../../mod/menu.php:84
+#: ../../mod/new_channel.php:117
+msgid "Create"
+msgstr ""
+
+#: ../../include/reddav.php:1111
+msgid "Upload file"
+msgstr ""
+
+#: ../../include/reddav.php:1114 ../../mod/profile_photo.php:361
+msgid "Upload"
+msgstr ""
+
#: ../../include/features.php:23
msgid "General Features"
msgstr ""
@@ -1938,7 +2002,7 @@ msgstr ""
msgid "add"
msgstr ""
-#: ../../include/identity.php:30 ../../mod/item.php:1266
+#: ../../include/identity.php:30 ../../mod/item.php:1270
msgid "Unable to obtain identity information from database"
msgstr ""
@@ -2035,12 +2099,12 @@ msgstr ""
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:729 ../../include/identity.php:977
+#: ../../include/identity.php:729 ../../include/identity.php:996
#: ../../mod/directory.php:160
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:730 ../../include/identity.php:988
+#: ../../include/identity.php:730 ../../include/identity.php:1007
#: ../../mod/directory.php:162
msgid "Homepage:"
msgstr ""
@@ -2083,7 +2147,7 @@ msgstr ""
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:942 ../../include/identity.php:1031
+#: ../../include/identity.php:942 ../../include/identity.php:1050
#: ../../include/apps.php:128 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
@@ -2092,99 +2156,107 @@ msgstr ""
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:962
+#: ../../include/identity.php:957
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/identity.php:981
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:963
+#: ../../include/identity.php:982
msgid "j F"
msgstr ""
-#: ../../include/identity.php:970
+#: ../../include/identity.php:989
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:974
+#: ../../include/identity.php:993
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:983
+#: ../../include/identity.php:1002
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:986 ../../mod/profiles.php:535
+#: ../../include/identity.php:1005 ../../mod/profiles.php:535
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:990 ../../mod/profiles.php:537
+#: ../../include/identity.php:1009 ../../mod/profiles.php:537
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:992
+#: ../../include/identity.php:1011
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:994 ../../mod/profiles.php:538
+#: ../../include/identity.php:1013 ../../mod/profiles.php:538
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:996
+#: ../../include/identity.php:1015
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:998 ../../mod/directory.php:164
+#: ../../include/identity.php:1017 ../../mod/directory.php:164
msgid "About:"
msgstr ""
-#: ../../include/identity.php:1000
+#: ../../include/identity.php:1019
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:1002 ../../mod/profiles.php:541
+#: ../../include/identity.php:1021 ../../mod/profiles.php:541
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:1004 ../../mod/profiles.php:542
+#: ../../include/identity.php:1023 ../../mod/profiles.php:542
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:1007
+#: ../../include/identity.php:1026
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:1009
+#: ../../include/identity.php:1028
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1030
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:1013
+#: ../../include/identity.php:1032
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:1015
+#: ../../include/identity.php:1034
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:1017
+#: ../../include/identity.php:1036
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:1019
+#: ../../include/identity.php:1038
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:1021
+#: ../../include/identity.php:1040
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:1023
+#: ../../include/identity.php:1042
msgid "School/education:"
msgstr ""
+#: ../../include/identity.php:1052
+msgid "Like this thing"
+msgstr ""
+
#: ../../include/network.php:652
msgid "view full size"
msgstr ""
@@ -2722,13 +2794,6 @@ msgstr ""
msgid "View all"
msgstr ""
-#: ../../include/ItemObject.php:134
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
#: ../../include/ItemObject.php:139
msgctxt "noun"
msgid "Dislike"
@@ -2756,11 +2821,11 @@ msgstr ""
msgid "Add Tag"
msgstr ""
-#: ../../include/ItemObject.php:208 ../../mod/photos.php:969
+#: ../../include/ItemObject.php:208 ../../mod/photos.php:974
msgid "I like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:209 ../../mod/photos.php:970
+#: ../../include/ItemObject.php:209 ../../mod/photos.php:975
msgid "I don't like this (toggle)"
msgstr ""
@@ -2822,13 +2887,13 @@ msgstr[1] ""
msgid "[+] show all"
msgstr ""
-#: ../../include/ItemObject.php:580 ../../mod/photos.php:988
-#: ../../mod/photos.php:1075
+#: ../../include/ItemObject.php:580 ../../mod/photos.php:993
+#: ../../mod/photos.php:1080
msgid "This is you"
msgstr ""
#: ../../include/ItemObject.php:582 ../../include/js_strings.php:6
-#: ../../mod/photos.php:990 ../../mod/photos.php:1077
+#: ../../mod/photos.php:995 ../../mod/photos.php:1082
msgid "Comment"
msgstr ""
@@ -2839,15 +2904,15 @@ msgstr ""
#: ../../mod/poke.php:166 ../../mod/profiles.php:515 ../../mod/chat.php:177
#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:476
#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58
+#: ../../mod/photos.php:563 ../../mod/photos.php:668 ../../mod/photos.php:956
+#: ../../mod/photos.php:996 ../../mod/photos.php:1083
#: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/events.php:492 ../../mod/filestorage.php:135
+#: ../../mod/events.php:492 ../../mod/filestorage.php:137
#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:442
-#: ../../mod/admin.php:751 ../../mod/admin.php:885 ../../mod/admin.php:1018
-#: ../../mod/admin.php:1217 ../../mod/admin.php:1304 ../../mod/thing.php:283
-#: ../../mod/thing.php:326 ../../mod/import.php:393 ../../mod/invite.php:156
-#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/photos.php:563
-#: ../../mod/photos.php:668 ../../mod/photos.php:951 ../../mod/photos.php:991
-#: ../../mod/photos.php:1078 ../../mod/appman.php:99
+#: ../../mod/admin.php:751 ../../mod/admin.php:886 ../../mod/admin.php:1019
+#: ../../mod/admin.php:1218 ../../mod/admin.php:1305 ../../mod/thing.php:286
+#: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:156
+#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/appman.php:99
#: ../../view/theme/apw/php/config.php:256
#: ../../view/theme/blogga/php/config.php:67
#: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -3253,7 +3318,7 @@ msgid "Login failed."
msgstr ""
#: ../../include/items.php:306 ../../mod/profperm.php:23
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:63
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:202
#: ../../index.php:360
msgid "Permission denied"
msgstr ""
@@ -3262,32 +3327,32 @@ msgstr ""
msgid "(Unknown)"
msgstr ""
-#: ../../include/items.php:3617 ../../mod/display.php:32
-#: ../../mod/filestorage.php:18 ../../mod/home.php:65 ../../mod/admin.php:159
-#: ../../mod/admin.php:922 ../../mod/admin.php:1125 ../../mod/thing.php:78
+#: ../../include/items.php:3618 ../../mod/home.php:67 ../../mod/display.php:32
+#: ../../mod/filestorage.php:18 ../../mod/admin.php:159
+#: ../../mod/admin.php:923 ../../mod/admin.php:1126 ../../mod/thing.php:78
#: ../../mod/viewsrc.php:18
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4041 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4051 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4056
+#: ../../include/items.php:4066
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:4063
+#: ../../include/items.php:4073
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4074
+#: ../../include/items.php:4084
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:4077
+#: ../../include/items.php:4087
msgid "Connection not found."
msgstr ""
@@ -3472,10 +3537,6 @@ msgstr ""
msgid "Higher numbers will sink to bottom of listing"
msgstr ""
-#: ../../mod/mitem.php:142 ../../mod/menu.php:84 ../../mod/new_channel.php:117
-msgid "Create"
-msgstr ""
-
#: ../../mod/mitem.php:154
msgid "Menu item not found."
msgstr ""
@@ -3558,7 +3619,8 @@ msgid "Add application"
msgstr ""
#: ../../mod/settings.php:517 ../../mod/settings.php:543
-#: ../../mod/admin.php:892
+#: ../../mod/admin.php:893
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:35
msgid "Name"
msgstr ""
@@ -4027,7 +4089,7 @@ msgid "Invalid item."
msgstr ""
#: ../../mod/block.php:39 ../../mod/chanview.php:77 ../../mod/page.php:47
-#: ../../mod/home.php:52 ../../mod/wall_upload.php:28
+#: ../../mod/home.php:54 ../../mod/wall_upload.php:28
msgid "Channel not found."
msgstr ""
@@ -4075,10 +4137,6 @@ msgstr ""
msgid "Upload Profile Photo"
msgstr ""
-#: ../../mod/profile_photo.php:361
-msgid "Upload"
-msgstr ""
-
#: ../../mod/profile_photo.php:365
msgid "skip this step"
msgstr ""
@@ -4185,7 +4243,7 @@ msgstr ""
msgid "Interests"
msgstr ""
-#: ../../mod/profiles.php:337 ../../mod/admin.php:892
+#: ../../mod/profiles.php:337 ../../mod/admin.php:893
msgid "Address"
msgstr ""
@@ -4581,7 +4639,7 @@ msgstr ""
msgid "Please login."
msgstr ""
-#: ../../mod/cloud.php:112
+#: ../../mod/cloud.php:113
msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
msgstr ""
@@ -5158,7 +5216,7 @@ msgstr ""
msgid "Potential Delegates"
msgstr ""
-#: ../../mod/delegate.php:130 ../../mod/tagrm.php:93 ../../mod/photos.php:906
+#: ../../mod/delegate.php:130 ../../mod/photos.php:906 ../../mod/tagrm.php:93
msgid "Remove"
msgstr ""
@@ -5171,8 +5229,8 @@ msgid "No entries."
msgstr ""
#: ../../mod/search.php:13 ../../mod/directory.php:15
-#: ../../mod/dirprofile.php:9 ../../mod/display.php:9
-#: ../../mod/viewconnections.php:17 ../../mod/photos.php:443
+#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 ../../mod/photos.php:443
+#: ../../mod/viewconnections.php:17
msgid "Public access denied."
msgstr ""
@@ -5224,6 +5282,15 @@ msgstr ""
msgid "This site is not a directory server"
msgstr ""
+#: ../../mod/home.php:81
+msgid "Red Matrix - &quot;The Network&quot;"
+msgstr ""
+
+#: ../../mod/home.php:94
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
#: ../../mod/setup.php:162
msgid "Red Matrix Server - Setup"
msgstr ""
@@ -5734,6 +5801,133 @@ msgstr ""
msgid "Site Administrators"
msgstr ""
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../mod/photos.php:97
+msgid "Album not found."
+msgstr ""
+
+#: ../../mod/photos.php:119 ../../mod/photos.php:669
+msgid "Delete Album"
+msgstr ""
+
+#: ../../mod/photos.php:159 ../../mod/photos.php:957
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:453
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:500
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/photos.php:574
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr ""
+
+#: ../../mod/photos.php:577
+#, php-format
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr ""
+
+#: ../../mod/photos.php:596
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:600 ../../mod/photos.php:664
+msgid "New album name: "
+msgstr ""
+
+#: ../../mod/photos.php:601
+msgid "or existing album name: "
+msgstr ""
+
+#: ../../mod/photos.php:602
+msgid "Do not show a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:653 ../../mod/photos.php:675 ../../mod/photos.php:1129
+#: ../../mod/photos.php:1144
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:679
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:685
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:687
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:730 ../../mod/photos.php:1176
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:776
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:778
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:838
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:862
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:940
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:942
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:943
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:946
+msgid "New album name"
+msgstr ""
+
+#: ../../mod/photos.php:949
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:951
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:954
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+
+#: ../../mod/photos.php:1107
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1182
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1191
+msgid "Recent Photos"
+msgstr ""
+
#: ../../mod/sources.php:32
msgid "Failed to create source. No channel selected."
msgstr ""
@@ -5875,46 +6069,30 @@ msgstr ""
msgid "File not found."
msgstr ""
-#: ../../mod/filestorage.php:121
+#: ../../mod/filestorage.php:122
msgid "Edit file permissions"
msgstr ""
-#: ../../mod/filestorage.php:129
+#: ../../mod/filestorage.php:131
msgid "Set/edit permissions"
msgstr ""
-#: ../../mod/filestorage.php:130
+#: ../../mod/filestorage.php:132
msgid "Include all files and sub folders"
msgstr ""
-#: ../../mod/filestorage.php:131
+#: ../../mod/filestorage.php:133
msgid "Return to file list"
msgstr ""
-#: ../../mod/filestorage.php:133
+#: ../../mod/filestorage.php:135
msgid "Copy/paste this code to attach file to a post"
msgstr ""
-#: ../../mod/filestorage.php:134
+#: ../../mod/filestorage.php:136
msgid "Copy/paste this URL to link file from a web page"
msgstr ""
-#: ../../mod/filestorage.php:171
-msgid "Download"
-msgstr ""
-
-#: ../../mod/filestorage.php:177
-msgid "Used: "
-msgstr ""
-
-#: ../../mod/filestorage.php:178
-msgid "[directory]"
-msgstr ""
-
-#: ../../mod/filestorage.php:180
-msgid "Limit: "
-msgstr ""
-
#: ../../mod/follow.php:25
msgid "Channel added."
msgstr ""
@@ -6020,15 +6198,6 @@ msgstr ""
msgid "Select a tag to remove: "
msgstr ""
-#: ../../mod/home.php:79
-msgid "Red Matrix - &quot;The Network&quot;"
-msgstr ""
-
-#: ../../mod/home.php:92
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
#: ../../mod/admin.php:52
msgid "Theme settings updated."
msgstr ""
@@ -6041,15 +6210,15 @@ msgstr ""
msgid "Accounts"
msgstr ""
-#: ../../mod/admin.php:94 ../../mod/admin.php:884
+#: ../../mod/admin.php:94 ../../mod/admin.php:885
msgid "Channels"
msgstr ""
-#: ../../mod/admin.php:95 ../../mod/admin.php:975 ../../mod/admin.php:1017
+#: ../../mod/admin.php:95 ../../mod/admin.php:976 ../../mod/admin.php:1018
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:96 ../../mod/admin.php:1180 ../../mod/admin.php:1216
+#: ../../mod/admin.php:96 ../../mod/admin.php:1181 ../../mod/admin.php:1217
msgid "Themes"
msgstr ""
@@ -6061,7 +6230,7 @@ msgstr ""
msgid "DB updates"
msgstr ""
-#: ../../mod/admin.php:112 ../../mod/admin.php:119 ../../mod/admin.php:1303
+#: ../../mod/admin.php:112 ../../mod/admin.php:119 ../../mod/admin.php:1304
msgid "Logs"
msgstr ""
@@ -6078,9 +6247,9 @@ msgid "Message queues"
msgstr ""
#: ../../mod/admin.php:202 ../../mod/admin.php:440 ../../mod/admin.php:540
-#: ../../mod/admin.php:749 ../../mod/admin.php:883 ../../mod/admin.php:974
-#: ../../mod/admin.php:1016 ../../mod/admin.php:1179 ../../mod/admin.php:1215
-#: ../../mod/admin.php:1302
+#: ../../mod/admin.php:749 ../../mod/admin.php:884 ../../mod/admin.php:975
+#: ../../mod/admin.php:1017 ../../mod/admin.php:1180 ../../mod/admin.php:1216
+#: ../../mod/admin.php:1303
msgid "Administration"
msgstr ""
@@ -6437,7 +6606,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:752 ../../mod/admin.php:886
+#: ../../mod/admin.php:752 ../../mod/admin.php:887
msgid "select all"
msgstr ""
@@ -6489,131 +6658,131 @@ msgid ""
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:798
+#: ../../mod/admin.php:799
#, php-format
msgid "%s channel censored/uncensored"
msgid_plural "%s channelss censored/uncensored"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:806
#, php-format
msgid "%s channel deleted"
msgid_plural "%s channels deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:825
msgid "Channel not found"
msgstr ""
-#: ../../mod/admin.php:835
+#: ../../mod/admin.php:836
#, php-format
msgid "Channel '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:845
+#: ../../mod/admin.php:846
#, php-format
msgid "Channel '%s' uncensored"
msgstr ""
-#: ../../mod/admin.php:845
+#: ../../mod/admin.php:846
#, php-format
msgid "Channel '%s' censored"
msgstr ""
-#: ../../mod/admin.php:888
+#: ../../mod/admin.php:889
msgid "Censor"
msgstr ""
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:890
msgid "Uncensor"
msgstr ""
-#: ../../mod/admin.php:892
+#: ../../mod/admin.php:893
msgid "UID"
msgstr ""
-#: ../../mod/admin.php:894
+#: ../../mod/admin.php:895
msgid ""
"Selected channels will be deleted!\\n\\nEverything that was posted in these "
"channels on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:895
+#: ../../mod/admin.php:896
msgid ""
"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
"channel on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:934
+#: ../../mod/admin.php:935
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:938
+#: ../../mod/admin.php:939
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:948 ../../mod/admin.php:1150
+#: ../../mod/admin.php:949 ../../mod/admin.php:1151
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:950 ../../mod/admin.php:1152
+#: ../../mod/admin.php:951 ../../mod/admin.php:1153
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:976 ../../mod/admin.php:1181
+#: ../../mod/admin.php:977 ../../mod/admin.php:1182
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:984 ../../mod/admin.php:1191
+#: ../../mod/admin.php:985 ../../mod/admin.php:1192
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:985 ../../mod/admin.php:1192
+#: ../../mod/admin.php:986 ../../mod/admin.php:1193
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:1114
+#: ../../mod/admin.php:1115
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1174
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:1221
+#: ../../mod/admin.php:1222
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:1222
+#: ../../mod/admin.php:1223
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:1249
+#: ../../mod/admin.php:1250
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:1305
+#: ../../mod/admin.php:1306
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:1311
+#: ../../mod/admin.php:1312
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:1312
+#: ../../mod/admin.php:1313
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:1312
+#: ../../mod/admin.php:1313
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr ""
-#: ../../mod/admin.php:1313
+#: ../../mod/admin.php:1314
msgid "Log level"
msgstr ""
@@ -6642,39 +6811,35 @@ msgstr ""
msgid "item not found."
msgstr ""
-#: ../../mod/thing.php:269
+#: ../../mod/thing.php:272
msgid "Edit Thing"
msgstr ""
-#: ../../mod/thing.php:271 ../../mod/thing.php:318
+#: ../../mod/thing.php:274 ../../mod/thing.php:321
msgid "Select a profile"
msgstr ""
-#: ../../mod/thing.php:273 ../../mod/thing.php:320
-msgid "Select a category of stuff. e.g. I ______ something"
-msgstr ""
-
-#: ../../mod/thing.php:275 ../../mod/thing.php:321
+#: ../../mod/thing.php:278 ../../mod/thing.php:324
msgid "Post an activity"
msgstr ""
-#: ../../mod/thing.php:275 ../../mod/thing.php:321
+#: ../../mod/thing.php:278 ../../mod/thing.php:324
msgid "Only sends to viewers of the applicable profile"
msgstr ""
-#: ../../mod/thing.php:277 ../../mod/thing.php:323
+#: ../../mod/thing.php:280 ../../mod/thing.php:326
msgid "Name of thing e.g. something"
msgstr ""
-#: ../../mod/thing.php:279 ../../mod/thing.php:324
+#: ../../mod/thing.php:282 ../../mod/thing.php:327
msgid "URL of thing (optional)"
msgstr ""
-#: ../../mod/thing.php:281 ../../mod/thing.php:325
+#: ../../mod/thing.php:284 ../../mod/thing.php:328
msgid "URL for photo of thing (optional)"
msgstr ""
-#: ../../mod/thing.php:316
+#: ../../mod/thing.php:319
msgid "Add Thing to your Profile"
msgstr ""
@@ -6844,16 +7009,16 @@ msgstr ""
msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../mod/item.php:828
+#: ../../mod/item.php:832
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1271
+#: ../../mod/item.php:1275
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1277
+#: ../../mod/item.php:1281
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -6871,6 +7036,10 @@ msgstr ""
msgid "Layout Name"
msgstr ""
+#: ../../mod/like.php:97
+msgid "thing"
+msgstr ""
+
#: ../../mod/lockview.php:30 ../../mod/lockview.php:36
msgid "Remote privacy information not available."
msgstr ""
@@ -6916,7 +7085,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:85 ../../boot.php:1467
+#: ../../mod/lostpass.php:85 ../../boot.php:1475
msgid "Password Reset"
msgstr ""
@@ -7229,133 +7398,6 @@ msgid ""
"Or <a href=\"import\">import an existing channel</a> from another location"
msgstr ""
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:97
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:119 ../../mod/photos.php:669
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:159 ../../mod/photos.php:952
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:453
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:500
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:574
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:577
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:596
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:600 ../../mod/photos.php:664
-msgid "New album name: "
-msgstr ""
-
-#: ../../mod/photos.php:601
-msgid "or existing album name: "
-msgstr ""
-
-#: ../../mod/photos.php:602
-msgid "Do not show a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:653 ../../mod/photos.php:675 ../../mod/photos.php:1124
-#: ../../mod/photos.php:1139
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:679
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:685
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:687
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:730 ../../mod/photos.php:1171
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:776
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:778
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:838
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:862
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:936
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:938
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:939
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:941
-msgid "New album name"
-msgstr ""
-
-#: ../../mod/photos.php:944
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:946
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:949
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr ""
-
-#: ../../mod/photos.php:1102
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../mod/photos.php:1177
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1186
-msgid "Recent Photos"
-msgstr ""
-
#: ../../mod/notifications.php:26
msgid "Invalid request identifier."
msgstr ""
@@ -7717,41 +7759,61 @@ msgstr ""
msgid "Are you a clean desk or a messy desk person?"
msgstr ""
-#: ../../boot.php:1265
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:38
+msgid "Type"
+msgstr ""
+
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:40
+msgid "Size"
+msgstr ""
+
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:42
+msgid "Last modified"
+msgstr ""
+
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:85
+msgid "Are you sure you want to delete this item?"
+msgstr ""
+
+#: ../../view/tpl/smarty3/compiled/de0b699d2fc212753c3f166003476a343ca00174.file.cloud_directory.tpl.php:103
+msgid "Total"
+msgstr ""
+
+#: ../../boot.php:1273
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../boot.php:1268
+#: ../../boot.php:1276
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../boot.php:1432
+#: ../../boot.php:1440
msgid ""
"Create an account to access services and applications within the Red Matrix"
msgstr ""
-#: ../../boot.php:1460
+#: ../../boot.php:1468
msgid "Password"
msgstr ""
-#: ../../boot.php:1461
+#: ../../boot.php:1469
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1466
+#: ../../boot.php:1474
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:1531
+#: ../../boot.php:1539
msgid "permission denied"
msgstr ""
-#: ../../boot.php:1532
+#: ../../boot.php:1540
msgid "Got Zot?"
msgstr ""
-#: ../../boot.php:1962
+#: ../../boot.php:1970
msgid "toggle mobile"
msgstr ""
diff --git a/version.inc b/version.inc
index 48858704d..e7a0f43d3 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-06-26.718
+2014-06-28.720