fix double lines

This commit is contained in:
friendica 2012-07-02 16:34:01 -07:00
parent 64fc1318c6
commit ced0a208d8
3 changed files with 120 additions and 80 deletions

View File

@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1391' ); define ( 'FRIENDICA_VERSION', '3.0.1392' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1151 ); define ( 'DB_UPDATE_VERSION', 1151 );

View File

@ -93,8 +93,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Convert new line chars to html <br /> tags // Convert new line chars to html <br /> tags
// nlbr seems to be hopelessly messed up
// $Text = nl2br($Text);
// $Text = nl2br($Text); // We'll emulate it.
$Text = str_replace("\r\n","\n", $Text);
$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text); $Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
if($preserve_nl) if($preserve_nl)

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1391\n" "Project-Id-Version: 3.0.1392\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-01 10:00-0700\n" "POT-Creation-Date: 2012-07-02 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -130,7 +130,7 @@ msgstr ""
#: ../../mod/localtime.php:45 ../../mod/contacts.php:343 #: ../../mod/localtime.php:45 ../../mod/contacts.php:343
#: ../../mod/settings.php:555 ../../mod/settings.php:709 #: ../../mod/settings.php:555 ../../mod/settings.php:709
#: ../../mod/settings.php:770 ../../mod/settings.php:971 #: ../../mod/settings.php:770 ../../mod/settings.php:971
#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410 #: ../../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:420 ../../mod/admin.php:656 ../../mod/admin.php:792
#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:569 #: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:569
#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
@ -223,7 +223,7 @@ msgstr ""
msgid "Edit event" msgid "Edit event"
msgstr "" msgstr ""
#: ../../mod/events.php:304 ../../include/text.php:1065 #: ../../mod/events.php:304 ../../include/text.php:1069
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
@ -282,8 +282,9 @@ msgstr ""
msgid "Description:" msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:429 ../../include/event.php:40 #: ../../mod/events.php:429 ../../mod/directory.php:132
#: ../../include/bb2diaspora.php:357 ../../boot.php:1136 #: ../../include/event.php:40 ../../include/bb2diaspora.php:357
#: ../../boot.php:1136
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -417,7 +418,7 @@ msgstr ""
#: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70 #: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1317 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1321
#: ../../include/diaspora.php:1710 ../../include/conversation.php:53 #: ../../include/diaspora.php:1710 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
msgid "photo" msgid "photo"
@ -571,7 +572,7 @@ msgstr ""
#: ../../mod/photos.php:1324 ../../mod/editpost.php:104 #: ../../mod/photos.php:1324 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:215 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215
#: ../../mod/message.php:411 ../../include/conversation.php:371 #: ../../mod/message.php:413 ../../include/conversation.php:371
#: ../../include/conversation.php:731 ../../include/conversation.php:1012 #: ../../include/conversation.php:731 ../../include/conversation.php:1012
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -669,7 +670,7 @@ msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
#: ../../mod/message.php:213 ../../mod/message.php:408 #: ../../mod/message.php:213 ../../mod/message.php:410
#: ../../include/conversation.php:994 #: ../../include/conversation.php:994
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
@ -679,7 +680,7 @@ msgid "Attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
#: ../../mod/message.php:214 ../../mod/message.php:409 #: ../../mod/message.php:214 ../../mod/message.php:411
#: ../../include/conversation.php:998 #: ../../include/conversation.php:998
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
@ -2490,17 +2491,17 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:133 ../../mod/message.php:201 #: ../../mod/wallmessage.php:133 ../../mod/message.php:201
#: ../../mod/message.php:399 #: ../../mod/message.php:401
msgid "To:" msgid "To:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:134 ../../mod/message.php:206 #: ../../mod/wallmessage.php:134 ../../mod/message.php:206
#: ../../mod/message.php:401 #: ../../mod/message.php:403
msgid "Subject:" msgid "Subject:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:140 ../../mod/message.php:210 #: ../../mod/wallmessage.php:140 ../../mod/message.php:210
#: ../../mod/message.php:404 ../../mod/invite.php:113 #: ../../mod/message.php:406 ../../mod/invite.php:113
msgid "Your message:" msgid "Your message:"
msgstr "" msgstr ""
@ -2987,55 +2988,55 @@ msgstr ""
msgid "Conversation removed." msgid "Conversation removed."
msgstr "" msgstr ""
#: ../../mod/message.php:247 #: ../../mod/message.php:249
msgid "No messages." msgid "No messages."
msgstr "" msgstr ""
#: ../../mod/message.php:254 #: ../../mod/message.php:256
#, php-format #, php-format
msgid "Unknown sender - %s" msgid "Unknown sender - %s"
msgstr "" msgstr ""
#: ../../mod/message.php:257 #: ../../mod/message.php:259
#, php-format #, php-format
msgid "You and %s" msgid "You and %s"
msgstr "" msgstr ""
#: ../../mod/message.php:260 #: ../../mod/message.php:262
#, php-format #, php-format
msgid "%s and You" msgid "%s and You"
msgstr "" msgstr ""
#: ../../mod/message.php:270 ../../mod/message.php:392 #: ../../mod/message.php:272 ../../mod/message.php:394
msgid "Delete conversation" msgid "Delete conversation"
msgstr "" msgstr ""
#: ../../mod/message.php:273 #: ../../mod/message.php:275
msgid "D, d M Y - g:i A" msgid "D, d M Y - g:i A"
msgstr "" msgstr ""
#: ../../mod/message.php:275 #: ../../mod/message.php:277
#, php-format #, php-format
msgid "%d message" msgid "%d message"
msgid_plural "%d messages" msgid_plural "%d messages"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/message.php:310 #: ../../mod/message.php:312
msgid "Message not available." msgid "Message not available."
msgstr "" msgstr ""
#: ../../mod/message.php:375 #: ../../mod/message.php:377
msgid "Delete message" msgid "Delete message"
msgstr "" msgstr ""
#: ../../mod/message.php:394 #: ../../mod/message.php:396
msgid "" msgid ""
"No secure communications available. You <strong>may</strong> be able to " "No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page." "respond from the sender's profile page."
msgstr "" msgstr ""
#: ../../mod/message.php:398 #: ../../mod/message.php:400
msgid "Send Reply" msgid "Send Reply"
msgstr "" msgstr ""
@ -4017,7 +4018,7 @@ msgid ""
"be visible to anybody using the internet." "be visible to anybody using the internet."
msgstr "" msgstr ""
#: ../../mod/profiles.php:624 ../../mod/directory.php:111 #: ../../mod/profiles.php:624 ../../mod/directory.php:109
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
@ -4093,6 +4094,38 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" msgstr ""
#: ../../mod/babel.php:17
msgid "Source (bbcode) text:"
msgstr ""
#: ../../mod/babel.php:25
msgid "Source input: "
msgstr ""
#: ../../mod/babel.php:29
msgid "bb2html: "
msgstr ""
#: ../../mod/babel.php:33
msgid "bb2html2bb: "
msgstr ""
#: ../../mod/babel.php:37
msgid "bb2md: "
msgstr ""
#: ../../mod/babel.php:41
msgid "bb2md2html: "
msgstr ""
#: ../../mod/babel.php:45
msgid "bb2dia2bb: "
msgstr ""
#: ../../mod/babel.php:49
msgid "bb2md2html2bb: "
msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626 #: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
#: ../../include/contact_widgets.php:34 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
@ -4120,11 +4153,30 @@ msgstr ""
msgid "Site Directory" msgid "Site Directory"
msgstr "" msgstr ""
#: ../../mod/directory.php:114 #: ../../mod/directory.php:112
msgid "Gender: " msgid "Gender: "
msgstr "" msgstr ""
#: ../../mod/directory.php:140 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
#: ../../boot.php:1138
msgid "Gender:"
msgstr ""
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
#: ../../boot.php:1141
msgid "Status:"
msgstr ""
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
#: ../../boot.php:1143
msgid "Homepage:"
msgstr ""
#: ../../mod/directory.php:140 ../../include/profile_advanced.php:58
msgid "About:"
msgstr ""
#: ../../mod/directory.php:178
msgid "No entries (some entries may be hidden)." msgid "No entries (some entries may be hidden)."
msgstr "" msgstr ""
@ -4745,7 +4797,7 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1315 #: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1319
#: ../../include/conversation.php:45 ../../include/conversation.php:118 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -6131,10 +6183,6 @@ msgstr ""
msgid "Set colour scheme" msgid "Set colour scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1138
msgid "Gender:"
msgstr ""
#: ../../include/profile_advanced.php:22 #: ../../include/profile_advanced.php:22
msgid "j F, Y" msgid "j F, Y"
msgstr "" msgstr ""
@ -6151,19 +6199,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1141
msgid "Status:"
msgstr ""
#: ../../include/profile_advanced.php:43 #: ../../include/profile_advanced.php:43
#, php-format #, php-format
msgid "for %1$d %2$s" msgid "for %1$d %2$s"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:48 ../../boot.php:1143
msgid "Homepage:"
msgstr ""
#: ../../include/profile_advanced.php:52 #: ../../include/profile_advanced.php:52
msgid "Tags:" msgid "Tags:"
msgstr "" msgstr ""
@ -6172,10 +6212,6 @@ msgstr ""
msgid "Religion:" msgid "Religion:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:58
msgid "About:"
msgstr ""
#: ../../include/profile_advanced.php:60 #: ../../include/profile_advanced.php:60
msgid "Hobbies/Interests:" msgid "Hobbies/Interests:"
msgstr "" msgstr ""
@ -6564,127 +6600,127 @@ msgid_plural "%d Contacts"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: ../../include/text.php:835 #: ../../include/text.php:839
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "January" msgid "January"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "February" msgid "February"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "March" msgid "March"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "April" msgid "April"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "May" msgid "May"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "June" msgid "June"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "July" msgid "July"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "August" msgid "August"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "September" msgid "September"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "October" msgid "October"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "November" msgid "November"
msgstr "" msgstr ""
#: ../../include/text.php:839 #: ../../include/text.php:843
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../include/text.php:925 #: ../../include/text.php:929
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: ../../include/text.php:945 ../../include/text.php:960 #: ../../include/text.php:949 ../../include/text.php:964
msgid "remove" msgid "remove"
msgstr "" msgstr ""
#: ../../include/text.php:945 ../../include/text.php:960 #: ../../include/text.php:949 ../../include/text.php:964
msgid "[remove]" msgid "[remove]"
msgstr "" msgstr ""
#: ../../include/text.php:948 #: ../../include/text.php:952
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: ../../include/text.php:963 #: ../../include/text.php:967
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: ../../include/text.php:979 ../../include/text.php:991 #: ../../include/text.php:983 ../../include/text.php:995
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1097 ../../include/user.php:236 #: ../../include/text.php:1101 ../../include/user.php:236
msgid "default" msgid "default"
msgstr "" msgstr ""
#: ../../include/text.php:1109 #: ../../include/text.php:1113
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "" msgstr ""
#: ../../include/text.php:1319 #: ../../include/text.php:1323
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: ../../include/text.php:1321 #: ../../include/text.php:1325
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: ../../include/text.php:1322 #: ../../include/text.php:1326
msgid "post" msgid "post"
msgstr "" msgstr ""
#: ../../include/text.php:1477 #: ../../include/text.php:1481
msgid "Item filed" msgid "Item filed"
msgstr "" msgstr ""
@ -6696,7 +6732,7 @@ msgstr ""
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""
#: ../../include/network.php:839 #: ../../include/network.php:842
msgid "view full size" msgid "view full size"
msgstr "" msgstr ""
@ -7011,11 +7047,11 @@ msgstr ""
msgid "From: " msgid "From: "
msgstr "" msgstr ""
#: ../../include/bbcode.php:216 ../../include/bbcode.php:236 #: ../../include/bbcode.php:220 ../../include/bbcode.php:240
msgid "$1 wrote:" msgid "$1 wrote:"
msgstr "" msgstr ""
#: ../../include/bbcode.php:251 ../../include/bbcode.php:328 #: ../../include/bbcode.php:255 ../../include/bbcode.php:332
msgid "Image/photo" msgid "Image/photo"
msgstr "" msgstr ""