diff options
| -rw-r--r-- | boot.php | 32 | ||||
| -rw-r--r-- | database.sql | 20 | ||||
| -rw-r--r-- | include/bb2diaspora.php | 70 | ||||
| -rw-r--r-- | include/bbcode.php | 5 | ||||
| -rw-r--r-- | update.php | 20 | ||||
| -rw-r--r-- | util/messages.po | 321 |
6 files changed, 287 insertions, 181 deletions
@@ -10,9 +10,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1394' ); +define ( 'FRIENDICA_VERSION', '3.0.1395' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1152 ); +define ( 'DB_UPDATE_VERSION', 1153 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -196,6 +196,22 @@ define ( 'NOTIFY_SYSTEM', 0x8000 ); /** + * Tag/term types + */ + +define ( 'TERM_UNKNOWN', 0 ); +define ( 'TERM_HASHTAG', 1 ); +define ( 'TERM_MENTION', 2 ); +define ( 'TERM_CATEGORY', 3 ); +define ( 'TERM_PCATEGORY', 4 ); +define ( 'TERM_FILE', 5 ); + +define ( 'TERM_OBJ_POST', 1 ); +define ( 'TERM_OBJ_PHOTO', 2 ); + + + +/** * various namespaces we may need to parse */ @@ -370,13 +386,15 @@ if(! class_exists('App')) { if(x($_SERVER,'SERVER_NAME')) { $this->hostname = $_SERVER['SERVER_NAME']; - if(stristr($this->hostname,'xn--')) { + + // See bug 437 - this didn't work so disabling it + //if(stristr($this->hostname,'xn--')) { // PHP or webserver may have converted idn to punycode, so // convert punycode back to utf-8 - require_once('library/simplepie/idn/idna_convert.class.php'); - $x = new idna_convert(); - $this->hostname = $x->decode($_SERVER['SERVER_NAME']); - } + // require_once('library/simplepie/idn/idna_convert.class.php'); + // $x = new idna_convert(); + // $this->hostname = $x->decode($_SERVER['SERVER_NAME']); + //} if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) $this->hostname .= ':' . $_SERVER['SERVER_PORT']; diff --git a/database.sql b/database.sql index bd57d9fdd..1d0a32176 100644 --- a/database.sql +++ b/database.sql @@ -1001,6 +1001,26 @@ CREATE TABLE IF NOT EXISTS `spam` ( -- -------------------------------------------------------- -- +-- Table structure for table `term` +-- + +CREATE TABLE IF NOT EXISTS `term` ( + `tid` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `oid` INT UNSIGNED NOT NULL , + `otype` TINYINT( 3 ) UNSIGNED NOT NULL , + `type` TINYINT( 3 ) UNSIGNED NOT NULL , + `term` CHAR( 255 ) NOT NULL , + `url` CHAR( 255 ) NOT NULL, + PRIMARY KEY (`tid`), + KEY `oid` ( `oid` ), + KEY `otype` ( `otype` ), + KEY `type` ( `type` ), + KEY `term` ( `term` ) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- -- Table structure for table `tokens` -- diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index c93b60d0d..75dadb84c 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -70,6 +70,12 @@ function stripdcode_br_cb($s) { } +////////////////////// +// The following "diaspora_ul" and "diaspora_ol" are only appropriate for the +// pre-Markdownify conversion. If Markdownify isn't used, use the non-Markdownify +// versions below +////////////////////// +/* function diaspora_ul($s) { // Replace "[*]" followed by any number (including zero) of // spaces by "* " to match Diaspora's list format @@ -103,10 +109,38 @@ function diaspora_ol($s) { else return $s[0]; } +*/ + +////////////////////// +// Non-Markdownify versions of "diaspora_ol" and "diaspora_ul" +////////////////////// +function diaspora_ul($s) { + // Replace "[\\*]" followed by any number (including zero) of + // spaces by "* " to match Diaspora's list format + return preg_replace("/\[\\\\\*\]( *)/", "* ", $s[1]); +} + +function diaspora_ol($s) { + // A hack: Diaspora will create a properly-numbered ordered list even + // if you use '1.' for each element of the list, like: + // 1. First element + // 1. Second element + // 1. Third element + return preg_replace("/\[\\\\\*\]( *)/", "1. ", $s[1]); +} function bb2diaspora($Text,$preserve_nl = false) { +////////////////////// +// An attempt was made to convert bbcode to html and then to markdown +// consisting of the following lines. +// I'm undoing this as we have a lot of bbcode constructs which +// were simply getting lost, for instance bookmark, vimeo, video, youtube, events, etc. +// We can try this again, but need a very good test sequence to verify +// all the major bbcode constructs that we use are getting through. +////////////////////// +/* // bbcode() will convert "[*]" into "<li>" with no closing "</li>" // Markdownify() is unable to handle these, as it makes each new // "<li>" into a deeper nested element until it crashes. So pre-format @@ -115,6 +149,7 @@ function bb2diaspora($Text,$preserve_nl = false) { // Note that to get nested lists to work for Diaspora, we would need // to define the closing tag for the list elements. So nested lists // are going to be flattened out in Diaspora for now + $endlessloop = 0; while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || @@ -129,16 +164,7 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace_callback("/\[ol\](.*?)\[\/ol\]/is", 'diaspora_ol', $Text); } - - -////////////////////// -// An attempt was made to convert bbcode to html and then to markdown -// consisting of the following lines. -// I'm undoing this as we have a lot of bbcode constructs which -// were simply getting lost, for instance bookmark, vimeo, video, youtube, events, etc. -// We can try this again, but need a very good test sequence to verify -// all the major bbcode constructs that we use are getting through. -////////////////////// +*/ // Convert it to HTML - don't try oembed // $Text = bbcode($Text, $preserve_nl, false); @@ -244,15 +270,21 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","$2",$Text); // Check for list text - $Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text); - $Text = preg_replace_callback("/\[ul\](.*?)\[\/ul\]/is", 'diaspora_ul', $Text); - $Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=I\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=a\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=A\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[ol\](.*?)\[\/ol\]/is", 'diaspora_ol', $Text); -// $Text = preg_replace("/\[li\](.*?)\[\/li\]/s", '<li>$1</li>' ,$Text); + $endlessloop = 0; + while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || + ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || + ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || + ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { + $Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text); + $Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=I\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=a\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=A\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[ul\](.*?)\[\/ul\]/is", 'diaspora_ul', $Text); + $Text = preg_replace_callback("/\[ol\](.*?)\[\/ol\]/is", 'diaspora_ol', $Text); + $Text = preg_replace("/\[li\]( *)(.*?)\[\/li\]/s", '* $2' ,$Text); + } // Just get rid of table tags since Diaspora doesn't support tables $Text = preg_replace("/\[th\](.*?)\[\/th\]/s", '$1' ,$Text); diff --git a/include/bbcode.php b/include/bbcode.php index cb4a0bc6f..55a879497 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -166,14 +166,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Check for list text $Text = str_replace("[*]", "<li>", $Text); - $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>' ,$Text); // handle nested lists $endlessloop = 0; while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || - ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false))) && (++$endlessloop < 20)) { + ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || + ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); @@ -183,6 +183,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul>' ,$Text); $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); + $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>' ,$Text); } $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>' ,$Text); diff --git a/update.php b/update.php index 28fe469f1..d752eaa6d 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1152 ); +define( 'UPDATE_VERSION' , 1153 ); /** * @@ -1319,3 +1319,21 @@ function update_1151() { return UPDATE_SUCCESS; } +function update_1152() { + $r = q("CREATE TABLE IF NOT EXISTS `term` ( + `tid` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , + `oid` INT UNSIGNED NOT NULL , + `otype` TINYINT( 3 ) UNSIGNED NOT NULL , + `type` TINYINT( 3 ) UNSIGNED NOT NULL , + `term` CHAR( 255 ) NOT NULL , + `url` CHAR( 255 ) NOT NULL, + KEY `oid` ( `oid` ), + KEY `otype` ( `otype` ), + KEY `type` ( `type` ), + KEY `term` ( `term` ) + ) ENGINE = MYISAM DEFAULT CHARSET=utf8 "); + if (!$r) + return UPDATE_FAILED; + return UPDATE_SUCCESS; +} + diff --git a/util/messages.po b/util/messages.po index ab7465edd..c4a47cc25 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1394\n" +"Project-Id-Version: 3.0.1395\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-04 10:00-0700\n" +"POT-Creation-Date: 2012-07-05 10:00-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" @@ -127,13 +127,14 @@ msgstr "" #: ../../mod/photos.php:1309 ../../mod/photos.php:1349 #: ../../mod/photos.php:1389 ../../mod/photos.php:1420 #: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:343 -#: ../../mod/settings.php:555 ../../mod/settings.php:709 -#: ../../mod/settings.php:770 ../../mod/settings.php:971 -#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:412 -#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792 -#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:569 -#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/localtime.php:45 ../../mod/content.php:691 +#: ../../mod/contacts.php:343 ../../mod/settings.php:555 +#: ../../mod/settings.php:709 ../../mod/settings.php:770 +#: ../../mod/settings.php:971 ../../mod/group.php:85 ../../mod/message.php:216 +#: ../../mod/message.php:412 ../../mod/admin.php:420 ../../mod/admin.php:656 +#: ../../mod/admin.php:792 ../../mod/admin.php:991 ../../mod/admin.php:1078 +#: ../../mod/profiles.php:569 ../../mod/invite.php:119 +#: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 @@ -283,7 +284,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:429 ../../mod/directory.php:132 -#: ../../include/event.php:40 ../../include/bb2diaspora.php:357 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:377 #: ../../boot.php:1154 msgid "Location:" msgstr "" @@ -518,7 +519,8 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1192 ../../include/conversation.php:490 +#: ../../mod/photos.php:1192 ../../mod/content.php:601 +#: ../../include/conversation.php:490 msgid "Private Message" msgstr "" @@ -558,11 +560,13 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1327 ../../include/conversation.php:554 +#: ../../mod/photos.php:1327 ../../mod/content.php:665 +#: ../../include/conversation.php:554 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1328 ../../include/conversation.php:555 +#: ../../mod/photos.php:1328 ../../mod/content.php:666 +#: ../../include/conversation.php:555 msgid "I don't like this (toggle)" msgstr "" @@ -571,6 +575,7 @@ msgid "Share" msgstr "" #: ../../mod/photos.php:1330 ../../mod/editpost.php:104 +#: ../../mod/content.php:482 ../../mod/content.php:842 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215 #: ../../mod/message.php:413 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1012 @@ -578,22 +583,25 @@ msgid "Please wait" msgstr "" #: ../../mod/photos.php:1346 ../../mod/photos.php:1386 -#: ../../mod/photos.php:1417 ../../include/conversation.php:577 +#: ../../mod/photos.php:1417 ../../mod/content.php:688 +#: ../../include/conversation.php:577 msgid "This is you" msgstr "" #: ../../mod/photos.php:1348 ../../mod/photos.php:1388 -#: ../../mod/photos.php:1419 ../../include/conversation.php:579 -#: ../../boot.php:546 +#: ../../mod/photos.php:1419 ../../mod/content.php:690 +#: ../../include/conversation.php:579 ../../boot.php:546 msgid "Comment" msgstr "" #: ../../mod/photos.php:1350 ../../mod/editpost.php:125 -#: ../../include/conversation.php:589 ../../include/conversation.php:1030 +#: ../../mod/content.php:700 ../../include/conversation.php:589 +#: ../../include/conversation.php:1030 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1447 ../../mod/settings.php:618 +#: ../../mod/photos.php:1447 ../../mod/content.php:439 +#: ../../mod/content.php:720 ../../mod/settings.php:618 #: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:663 #: ../../include/conversation.php:328 ../../include/conversation.php:609 msgid "Delete" @@ -664,8 +672,8 @@ msgstr "" msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/settings.php:617 -#: ../../include/conversation.php:596 +#: ../../mod/editpost.php:95 ../../mod/content.php:707 +#: ../../mod/settings.php:617 ../../include/conversation.php:596 msgid "Edit" msgstr "" @@ -1172,7 +1180,7 @@ msgid "" msgstr "" #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:335 +#: ../../include/bb2diaspora.php:355 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -1234,6 +1242,138 @@ msgstr "" msgid "Visible to:" msgstr "" +#: ../../mod/content.php:119 ../../mod/network.php:436 +msgid "No such group" +msgstr "" + +#: ../../mod/content.php:130 ../../mod/network.php:447 +msgid "Group is empty" +msgstr "" + +#: ../../mod/content.php:134 ../../mod/network.php:451 +msgid "Group: " +msgstr "" + +#: ../../mod/content.php:438 ../../mod/content.php:719 +#: ../../include/conversation.php:327 ../../include/conversation.php:608 +msgid "Select" +msgstr "" + +#: ../../mod/content.php:455 ../../mod/content.php:812 +#: ../../mod/content.php:813 ../../include/conversation.php:344 +#: ../../include/conversation.php:701 ../../include/conversation.php:702 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: ../../mod/content.php:465 ../../mod/content.php:824 +#: ../../include/conversation.php:354 ../../include/conversation.php:713 +#, php-format +msgid "%s from %s" +msgstr "" + +#: ../../mod/content.php:480 ../../include/conversation.php:369 +msgid "View in context" +msgstr "" + +#: ../../mod/content.php:586 ../../include/conversation.php:475 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/content.php:587 ../../addon/page/page.php:76 +#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:87 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 +#: ../../boot.php:547 +msgid "show more" +msgstr "" + +#: ../../mod/content.php:665 ../../include/conversation.php:554 +msgid "like" +msgstr "" + +#: ../../mod/content.php:666 ../../include/conversation.php:555 +msgid "dislike" +msgstr "" + +#: ../../mod/content.php:668 ../../include/conversation.php:557 +msgid "Share this" +msgstr "" + +#: ../../mod/content.php:668 ../../include/conversation.php:557 +msgid "share" +msgstr "" + +#: ../../mod/content.php:692 ../../include/conversation.php:581 +msgid "Bold" +msgstr "" + +#: ../../mod/content.php:693 ../../include/conversation.php:582 +msgid "Italic" +msgstr "" + +#: ../../mod/content.php:694 ../../include/conversation.php:583 +msgid "Underline" +msgstr "" + +#: ../../mod/content.php:695 ../../include/conversation.php:584 +msgid "Quote" +msgstr "" + +#: ../../mod/content.php:696 ../../include/conversation.php:585 +msgid "Code" +msgstr "" + +#: ../../mod/content.php:697 ../../include/conversation.php:586 +msgid "Image" +msgstr "" + +#: ../../mod/content.php:698 ../../include/conversation.php:587 +msgid "Link" +msgstr "" + +#: ../../mod/content.php:699 ../../include/conversation.php:588 +msgid "Video" +msgstr "" + +#: ../../mod/content.php:732 ../../include/conversation.php:621 +msgid "add star" +msgstr "" + +#: ../../mod/content.php:733 ../../include/conversation.php:622 +msgid "remove star" +msgstr "" + +#: ../../mod/content.php:734 ../../include/conversation.php:623 +msgid "toggle star status" +msgstr "" + +#: ../../mod/content.php:737 ../../include/conversation.php:626 +msgid "starred" +msgstr "" + +#: ../../mod/content.php:738 ../../include/conversation.php:627 +msgid "add tag" +msgstr "" + +#: ../../mod/content.php:742 ../../include/conversation.php:631 +msgid "save to folder" +msgstr "" + +#: ../../mod/content.php:814 ../../include/conversation.php:703 +msgid "to" +msgstr "" + +#: ../../mod/content.php:815 ../../include/conversation.php:704 +msgid "Wall-to-Wall" +msgstr "" + +#: ../../mod/content.php:816 ../../include/conversation.php:705 +msgid "via Wall-To-Wall:" +msgstr "" + #: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -2410,18 +2550,6 @@ msgstr[1] "" msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:436 -msgid "No such group" -msgstr "" - -#: ../../mod/network.php:447 -msgid "Group is empty" -msgstr "" - -#: ../../mod/network.php:451 -msgid "Group: " -msgstr "" - #: ../../mod/network.php:461 msgid "Contact: " msgstr "" @@ -3722,7 +3850,7 @@ msgstr "" msgid "No contacts in common." msgstr "" -#: ../../mod/share.php:28 +#: ../../mod/share.php:28 ../../include/bb2diaspora.php:200 msgid "link" msgstr "" @@ -4731,12 +4859,6 @@ msgstr "" msgid "Forums" msgstr "" -#: ../../addon/page/page.php:76 ../../addon/page/page.php:110 -#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188 -#: ../../include/conversation.php:476 ../../boot.php:547 -msgid "show more" -msgstr "" - #: ../../addon/page/page.php:129 msgid "Forums:" msgstr "" @@ -6556,11 +6678,11 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:341 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:361 msgid "Starts:" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:349 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:369 msgid "Finishes:" msgstr "" @@ -7308,6 +7430,11 @@ msgstr "" msgid "Archives" msgstr "" +#: ../../include/bb2diaspora.php:200 ../../include/bb2diaspora.php:210 +#: ../../include/bb2diaspora.php:211 +msgid "image/photo" +msgstr "" + #: ../../include/user.php:38 msgid "An invitation is required." msgstr "" @@ -7434,116 +7561,6 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:327 ../../include/conversation.php:608 -msgid "Select" -msgstr "" - -#: ../../include/conversation.php:344 ../../include/conversation.php:701 -#: ../../include/conversation.php:702 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:354 ../../include/conversation.php:713 -#, php-format -msgid "%s from %s" -msgstr "" - -#: ../../include/conversation.php:369 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:475 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:554 -msgid "like" -msgstr "" - -#: ../../include/conversation.php:555 -msgid "dislike" -msgstr "" - -#: ../../include/conversation.php:557 -msgid "Share this" -msgstr "" - -#: ../../include/conversation.php:557 -msgid "share" -msgstr "" - -#: ../../include/conversation.php:581 -msgid "Bold" -msgstr "" - -#: ../../include/conversation.php:582 -msgid "Italic" -msgstr "" - -#: ../../include/conversation.php:583 -msgid "Underline" -msgstr "" - -#: ../../include/conversation.php:584 -msgid "Quote" -msgstr "" - -#: ../../include/conversation.php:585 -msgid "Code" -msgstr "" - -#: ../../include/conversation.php:586 -msgid "Image" -msgstr "" - -#: ../../include/conversation.php:587 -msgid "Link" -msgstr "" - -#: ../../include/conversation.php:588 -msgid "Video" -msgstr "" - -#: ../../include/conversation.php:621 -msgid "add star" -msgstr "" - -#: ../../include/conversation.php:622 -msgid "remove star" -msgstr "" - -#: ../../include/conversation.php:623 -msgid "toggle star status" -msgstr "" - -#: ../../include/conversation.php:626 -msgid "starred" -msgstr "" - -#: ../../include/conversation.php:627 -msgid "add tag" -msgstr "" - -#: ../../include/conversation.php:631 -msgid "save to folder" -msgstr "" - -#: ../../include/conversation.php:703 -msgid "to" -msgstr "" - -#: ../../include/conversation.php:704 -msgid "Wall-to-Wall" -msgstr "" - -#: ../../include/conversation.php:705 -msgid "via Wall-To-Wall:" -msgstr "" - #: ../../include/conversation.php:750 msgid "Delete Selected Items" msgstr "" |