fix !@#$ tinymce linebreaks for the thousandth time

This commit is contained in:
friendica 2012-07-04 17:15:43 -07:00
parent fd626022ec
commit 5589bca1e0
6 changed files with 180 additions and 157 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.1393' ); define ( 'FRIENDICA_VERSION', '3.0.1394' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1151 ); define ( 'DB_UPDATE_VERSION', 1151 );

View file

@ -204,7 +204,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Declare the format for [code] layout // Declare the format for [code] layout
$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text); // $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text);
$CodeLayout = '<code>$1</code>'; $CodeLayout = '<code>$1</code>';
// Check for [code] text // Check for [code] text

View file

@ -1537,7 +1537,6 @@ function undo_post_tagging($s) {
function fix_mce_lf($s) { function fix_mce_lf($s) {
$s = str_replace("\r\n","\n",$s); $s = str_replace("\r\n","\n",$s);
$s = str_replace("\n\n","\n",$s);
return $s; return $s;
} }

View file

@ -46,10 +46,19 @@
function rep(re, str) { function rep(re, str) {
s = s.replace(re,str);
//modify code to keep stuff intact within [code][/code] blocks //modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY //Waitman Gobble NO WARRANTY
/* This doesn't seem to work well with
[code]line1
line2[/code]
commenting out for now
*/
/*
var o = new Array(); var o = new Array();
var x = s.split("[code]"); var x = s.split("[code]");
var i = 0; var i = 0;
@ -71,7 +80,7 @@
} }
s = o.join("[code]"); s = o.join("[code]");
*/
}; };
@ -150,8 +159,8 @@
rep(/<blockquote[^>]*>/gi,"[quote]"); rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]"); rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]"); rep(/<hr \/>/gi,"[hr]");
rep(/<br (.*?)\/>/gi,"\n\n"); rep(/<br (.*?)\/>/gi,"\n");
rep(/<br\/>/gi,"\n\n"); rep(/<br\/>/gi,"\n");
rep(/<br>/gi,"\n"); rep(/<br>/gi,"\n");
rep(/<p>/gi,""); rep(/<p>/gi,"");
rep(/<\/p>/gi,"\n"); rep(/<\/p>/gi,"\n");
@ -171,6 +180,7 @@
function rep(re, str) { function rep(re, str) {
//modify code to keep stuff intact within [code][/code] blocks //modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY //Waitman Gobble NO WARRANTY

View file

@ -46,10 +46,19 @@
function rep(re, str) { function rep(re, str) {
s = s.replace(re,str);
//modify code to keep stuff intact within [code][/code] blocks //modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY //Waitman Gobble NO WARRANTY
/* This doesn't seem to work well with
[code]line1
line2[/code]
commenting out for now
*/
/*
var o = new Array(); var o = new Array();
var x = s.split("[code]"); var x = s.split("[code]");
var i = 0; var i = 0;
@ -71,7 +80,7 @@
} }
s = o.join("[code]"); s = o.join("[code]");
*/
}; };
@ -150,8 +159,8 @@
rep(/<blockquote[^>]*>/gi,"[quote]"); rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]"); rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]"); rep(/<hr \/>/gi,"[hr]");
rep(/<br (.*?)\/>/gi,"\n\n"); rep(/<br (.*?)\/>/gi,"\n");
rep(/<br\/>/gi,"\n\n"); rep(/<br\/>/gi,"\n");
rep(/<br>/gi,"\n"); rep(/<br>/gi,"\n");
rep(/<p>/gi,""); rep(/<p>/gi,"");
rep(/<\/p>/gi,"\n"); rep(/<\/p>/gi,"\n");
@ -171,6 +180,7 @@
function rep(re, str) { function rep(re, str) {
//modify code to keep stuff intact within [code][/code] blocks //modify code to keep stuff intact within [code][/code] blocks
//Waitman Gobble NO WARRANTY //Waitman Gobble NO WARRANTY

View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1393\n" "Project-Id-Version: 3.0.1394\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-03 10:00-0700\n" "POT-Creation-Date: 2012-07-04 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"
@ -36,7 +36,7 @@ msgstr ""
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
#: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:951 #: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:957
#: ../../mod/editpost.php:10 ../../mod/install.php:151 #: ../../mod/editpost.php:10 ../../mod/install.php:151
#: ../../mod/notifications.php:66 ../../mod/contacts.php:145 #: ../../mod/notifications.php:66 ../../mod/contacts.php:145
#: ../../mod/settings.php:106 ../../mod/settings.php:537 #: ../../mod/settings.php:106 ../../mod/settings.php:537
@ -123,9 +123,9 @@ msgid "New photo from this URL"
msgstr "" msgstr ""
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
#: ../../mod/events.php:436 ../../mod/photos.php:986 ../../mod/photos.php:1057 #: ../../mod/events.php:436 ../../mod/photos.php:992 ../../mod/photos.php:1063
#: ../../mod/photos.php:1303 ../../mod/photos.php:1343 #: ../../mod/photos.php:1309 ../../mod/photos.php:1349
#: ../../mod/photos.php:1383 ../../mod/photos.php:1414 #: ../../mod/photos.php:1389 ../../mod/photos.php:1420
#: ../../mod/install.php:246 ../../mod/install.php:284 #: ../../mod/install.php:246 ../../mod/install.php:284
#: ../../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
@ -228,7 +228,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131 #: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131
#: ../../include/nav.php:52 ../../boot.php:1559 #: ../../include/nav.php:52 ../../boot.php:1577
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -284,7 +284,7 @@ msgstr ""
#: ../../mod/events.php:429 ../../mod/directory.php:132 #: ../../mod/events.php:429 ../../mod/directory.php:132
#: ../../include/event.php:40 ../../include/bb2diaspora.php:357 #: ../../include/event.php:40 ../../include/bb2diaspora.php:357
#: ../../boot.php:1136 #: ../../boot.php:1154
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -365,19 +365,19 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:46 ../../boot.php:1553 #: ../../mod/photos.php:46 ../../boot.php:1571
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
#: ../../mod/photos.php:54 ../../mod/photos.php:156 ../../mod/photos.php:965 #: ../../mod/photos.php:54 ../../mod/photos.php:156 ../../mod/photos.php:971
#: ../../mod/photos.php:1049 ../../mod/photos.php:1064 #: ../../mod/photos.php:1055 ../../mod/photos.php:1070
#: ../../mod/photos.php:1492 ../../mod/photos.php:1504 #: ../../mod/photos.php:1498 ../../mod/photos.php:1510
#: ../../addon/communityhome/communityhome.php:110 #: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/theme.php:598
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:61 ../../mod/photos.php:1074 ../../mod/photos.php:1542 #: ../../mod/photos.php:61 ../../mod/photos.php:1080 ../../mod/photos.php:1548
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
@ -389,8 +389,8 @@ msgstr ""
msgid "Contact information unavailable" msgid "Contact information unavailable"
msgstr "" msgstr ""
#: ../../mod/photos.php:156 ../../mod/photos.php:660 ../../mod/photos.php:1049 #: ../../mod/photos.php:156 ../../mod/photos.php:660 ../../mod/photos.php:1055
#: ../../mod/photos.php:1064 ../../mod/profile_photo.php:60 #: ../../mod/photos.php:1070 ../../mod/profile_photo.php:60
#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 #: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
#: ../../mod/profile_photo.php:263 #: ../../mod/profile_photo.php:263
@ -404,11 +404,11 @@ msgstr ""
msgid "Album not found." msgid "Album not found."
msgstr "" msgstr ""
#: ../../mod/photos.php:184 ../../mod/photos.php:1058 #: ../../mod/photos.php:184 ../../mod/photos.php:1064
msgid "Delete Album" msgid "Delete Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:247 ../../mod/photos.php:1304 #: ../../mod/photos.php:247 ../../mod/photos.php:1310
msgid "Delete Photo" msgid "Delete Photo"
msgstr "" msgstr ""
@ -441,169 +441,169 @@ msgstr ""
msgid "Unable to process image." msgid "Unable to process image."
msgstr "" msgstr ""
#: ../../mod/photos.php:757 ../../mod/profile_photo.php:259 #: ../../mod/photos.php:763 ../../mod/profile_photo.php:259
#: ../../mod/wall_upload.php:118 #: ../../mod/wall_upload.php:118
msgid "Image upload failed." msgid "Image upload failed."
msgstr "" msgstr ""
#: ../../mod/photos.php:843 ../../mod/community.php:16 #: ../../mod/photos.php:849 ../../mod/community.php:16
#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17 #: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
msgid "Public access denied." msgid "Public access denied."
msgstr "" msgstr ""
#: ../../mod/photos.php:853 #: ../../mod/photos.php:859
msgid "No photos selected" msgid "No photos selected"
msgstr "" msgstr ""
#: ../../mod/photos.php:932 #: ../../mod/photos.php:938
msgid "Access to this item is restricted." msgid "Access to this item is restricted."
msgstr "" msgstr ""
#: ../../mod/photos.php:996 #: ../../mod/photos.php:1002
#, php-format #, php-format
msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
msgstr "" msgstr ""
#: ../../mod/photos.php:999 #: ../../mod/photos.php:1005
#, php-format #, php-format
msgid "You have used %1$.2f Mbytes of photo storage." msgid "You have used %1$.2f Mbytes of photo storage."
msgstr "" msgstr ""
#: ../../mod/photos.php:1005 #: ../../mod/photos.php:1011
msgid "Upload Photos" msgid "Upload Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:1009 ../../mod/photos.php:1053 #: ../../mod/photos.php:1015 ../../mod/photos.php:1059
msgid "New album name: " msgid "New album name: "
msgstr "" msgstr ""
#: ../../mod/photos.php:1010 #: ../../mod/photos.php:1016
msgid "or existing album name: " msgid "or existing album name: "
msgstr "" msgstr ""
#: ../../mod/photos.php:1011 #: ../../mod/photos.php:1017
msgid "Do not show a status post for this upload" msgid "Do not show a status post for this upload"
msgstr "" msgstr ""
#: ../../mod/photos.php:1013 ../../mod/photos.php:1299 #: ../../mod/photos.php:1019 ../../mod/photos.php:1305
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: ../../mod/photos.php:1068 #: ../../mod/photos.php:1074
msgid "Edit Album" msgid "Edit Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:1092 ../../mod/photos.php:1525 #: ../../mod/photos.php:1098 ../../mod/photos.php:1531
msgid "View Photo" msgid "View Photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:1127 #: ../../mod/photos.php:1133
msgid "Permission denied. Access to this item may be restricted." msgid "Permission denied. Access to this item may be restricted."
msgstr "" msgstr ""
#: ../../mod/photos.php:1129 #: ../../mod/photos.php:1135
msgid "Photo not available" msgid "Photo not available"
msgstr "" msgstr ""
#: ../../mod/photos.php:1179 #: ../../mod/photos.php:1185
msgid "View photo" msgid "View photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:1179 #: ../../mod/photos.php:1185
msgid "Edit photo" msgid "Edit photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:1180 #: ../../mod/photos.php:1186
msgid "Use as profile photo" msgid "Use as profile photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:1186 ../../include/conversation.php:490 #: ../../mod/photos.php:1192 ../../include/conversation.php:490
msgid "Private Message" msgid "Private Message"
msgstr "" msgstr ""
#: ../../mod/photos.php:1208 #: ../../mod/photos.php:1214
msgid "View Full Size" msgid "View Full Size"
msgstr "" msgstr ""
#: ../../mod/photos.php:1276 #: ../../mod/photos.php:1282
msgid "Tags: " msgid "Tags: "
msgstr "" msgstr ""
#: ../../mod/photos.php:1279 #: ../../mod/photos.php:1285
msgid "[Remove any tag]" msgid "[Remove any tag]"
msgstr "" msgstr ""
#: ../../mod/photos.php:1289 #: ../../mod/photos.php:1295
msgid "Rotate CW (right)" msgid "Rotate CW (right)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1290 #: ../../mod/photos.php:1296
msgid "Rotate CCW (left)" msgid "Rotate CCW (left)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1292 #: ../../mod/photos.php:1298
msgid "New album name" msgid "New album name"
msgstr "" msgstr ""
#: ../../mod/photos.php:1295 #: ../../mod/photos.php:1301
msgid "Caption" msgid "Caption"
msgstr "" msgstr ""
#: ../../mod/photos.php:1297 #: ../../mod/photos.php:1303
msgid "Add a Tag" msgid "Add a Tag"
msgstr "" msgstr ""
#: ../../mod/photos.php:1301 #: ../../mod/photos.php:1307
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "" msgstr ""
#: ../../mod/photos.php:1321 ../../include/conversation.php:554 #: ../../mod/photos.php:1327 ../../include/conversation.php:554
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1322 ../../include/conversation.php:555 #: ../../mod/photos.php:1328 ../../include/conversation.php:555
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1323 ../../include/conversation.php:993 #: ../../mod/photos.php:1329 ../../include/conversation.php:993
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1324 ../../mod/editpost.php:104 #: ../../mod/photos.php:1330 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:215 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215
#: ../../mod/message.php:413 ../../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 ""
#: ../../mod/photos.php:1340 ../../mod/photos.php:1380 #: ../../mod/photos.php:1346 ../../mod/photos.php:1386
#: ../../mod/photos.php:1411 ../../include/conversation.php:577 #: ../../mod/photos.php:1417 ../../include/conversation.php:577
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1342 ../../mod/photos.php:1382 #: ../../mod/photos.php:1348 ../../mod/photos.php:1388
#: ../../mod/photos.php:1413 ../../include/conversation.php:579 #: ../../mod/photos.php:1419 ../../include/conversation.php:579
#: ../../boot.php:528 #: ../../boot.php:546
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: ../../mod/photos.php:1344 ../../mod/editpost.php:125 #: ../../mod/photos.php:1350 ../../mod/editpost.php:125
#: ../../include/conversation.php:589 ../../include/conversation.php:1030 #: ../../include/conversation.php:589 ../../include/conversation.php:1030
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1441 ../../mod/settings.php:618 #: ../../mod/photos.php:1447 ../../mod/settings.php:618
#: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:663 #: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:663
#: ../../include/conversation.php:328 ../../include/conversation.php:609 #: ../../include/conversation.php:328 ../../include/conversation.php:609
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: ../../mod/photos.php:1531 #: ../../mod/photos.php:1537
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:1540 #: ../../mod/photos.php:1546
msgid "Recent Photos" msgid "Recent Photos"
msgstr "" msgstr ""
@ -1218,7 +1218,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1080 #: ../../include/contact_widgets.php:9 ../../boot.php:1098
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1749,7 +1749,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1192 #: ../../addon/facebook/facebook.php:1192
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2890 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2890
#: ../../boot.php:730 #: ../../boot.php:748
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1759,7 +1759,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:862 #: ../../mod/lostpass.php:83 ../../boot.php:880
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2434,7 +2434,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1565 #: ../../mod/notes.php:44 ../../boot.php:1583
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2685,7 +2685,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
#: ../../include/nav.php:50 ../../boot.php:1544 #: ../../include/nav.php:50 ../../boot.php:1562
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2789,7 +2789,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:828 #: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:846
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2832,7 +2832,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
#: ../../include/nav.php:51 ../../boot.php:1550 #: ../../include/nav.php:51 ../../boot.php:1568
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3635,7 +3635,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:993 #: ../../mod/profile.php:21 ../../boot.php:1011
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -3722,6 +3722,10 @@ msgstr ""
msgid "No contacts in common." msgid "No contacts in common."
msgstr "" msgstr ""
#: ../../mod/share.php:28
msgid "link"
msgstr ""
#: ../../mod/display.php:135 #: ../../mod/display.php:135
msgid "Item has been removed." msgid "Item has been removed."
msgstr "" msgstr ""
@ -4026,23 +4030,23 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:664 ../../boot.php:1102 #: ../../mod/profiles.php:664 ../../boot.php:1120
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:665 ../../boot.php:1103 #: ../../mod/profiles.php:665 ../../boot.php:1121
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:676 ../../boot.php:1113 #: ../../mod/profiles.php:676 ../../boot.php:1131
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:678 ../../boot.php:1116 #: ../../mod/profiles.php:678 ../../boot.php:1134
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:679 ../../boot.php:1117 #: ../../mod/profiles.php:679 ../../boot.php:1135
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4158,17 +4162,17 @@ msgid "Gender: "
msgstr "" msgstr ""
#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
#: ../../boot.php:1138 #: ../../boot.php:1156
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
#: ../../boot.php:1141 #: ../../boot.php:1159
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
#: ../../boot.php:1143 #: ../../boot.php:1161
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -4729,7 +4733,7 @@ msgstr ""
#: ../../addon/page/page.php:76 ../../addon/page/page.php:110 #: ../../addon/page/page.php:76 ../../addon/page/page.php:110
#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188 #: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188
#: ../../include/conversation.php:476 ../../boot.php:529 #: ../../include/conversation.php:476 ../../boot.php:547
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -4769,7 +4773,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:849 #: ../../include/nav.php:64 ../../boot.php:867
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -6779,7 +6783,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:848 #: ../../include/nav.php:46 ../../boot.php:866
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -6787,7 +6791,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1538 #: ../../include/nav.php:49 ../../boot.php:1556
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6867,11 +6871,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1096 #: ../../include/nav.php:138 ../../boot.php:1114
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1096 #: ../../include/nav.php:138 ../../boot.php:1114
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -7110,129 +7114,129 @@ msgstr ""
msgid "Please visit %s to view and/or reply to your private messages." msgid "Please visit %s to view and/or reply to your private messages."
msgstr "" msgstr ""
#: ../../include/enotify.php:73 #: ../../include/enotify.php:87
#, php-format #, php-format
msgid "%1$s commented on [url=%2$s]a %3$s[/url]" msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
msgstr "" msgstr ""
#: ../../include/enotify.php:80 #: ../../include/enotify.php:94
#, php-format #, php-format
msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]" msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
msgstr "" msgstr ""
#: ../../include/enotify.php:88 #: ../../include/enotify.php:102
#, php-format #, php-format
msgid "%1$s commented on [url=%2$s]your %3$s[/url]" msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
msgstr "" msgstr ""
#: ../../include/enotify.php:98 #: ../../include/enotify.php:112
#, php-format #, php-format
msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s" msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
msgstr "" msgstr ""
#: ../../include/enotify.php:99 #: ../../include/enotify.php:113
#, php-format #, php-format
msgid "%s commented on an item/conversation you have been following." msgid "%s commented on an item/conversation you have been following."
msgstr "" msgstr ""
#: ../../include/enotify.php:102 ../../include/enotify.php:117 #: ../../include/enotify.php:116 ../../include/enotify.php:131
#: ../../include/enotify.php:130 ../../include/enotify.php:143 #: ../../include/enotify.php:144 ../../include/enotify.php:157
#, php-format #, php-format
msgid "Please visit %s to view and/or reply to the conversation." msgid "Please visit %s to view and/or reply to the conversation."
msgstr "" msgstr ""
#: ../../include/enotify.php:109 #: ../../include/enotify.php:123
#, php-format #, php-format
msgid "[Friendica:Notify] %s posted to your profile wall" msgid "[Friendica:Notify] %s posted to your profile wall"
msgstr "" msgstr ""
#: ../../include/enotify.php:111 #: ../../include/enotify.php:125
#, php-format #, php-format
msgid "%1$s posted to your profile wall at %2$s" msgid "%1$s posted to your profile wall at %2$s"
msgstr "" msgstr ""
#: ../../include/enotify.php:113 #: ../../include/enotify.php:127
#, php-format #, php-format
msgid "%1$s posted to [url=%2s]your wall[/url]" msgid "%1$s posted to [url=%2s]your wall[/url]"
msgstr "" msgstr ""
#: ../../include/enotify.php:124 #: ../../include/enotify.php:138
#, php-format #, php-format
msgid "[Friendica:Notify] %s tagged you" msgid "[Friendica:Notify] %s tagged you"
msgstr "" msgstr ""
#: ../../include/enotify.php:125 #: ../../include/enotify.php:139
#, php-format #, php-format
msgid "%1$s tagged you at %2$s" msgid "%1$s tagged you at %2$s"
msgstr "" msgstr ""
#: ../../include/enotify.php:126 #: ../../include/enotify.php:140
#, php-format #, php-format
msgid "%1$s [url=%2$s]tagged you[/url]." msgid "%1$s [url=%2$s]tagged you[/url]."
msgstr "" msgstr ""
#: ../../include/enotify.php:137 #: ../../include/enotify.php:151
#, php-format #, php-format
msgid "[Friendica:Notify] %s tagged your post" msgid "[Friendica:Notify] %s tagged your post"
msgstr "" msgstr ""
#: ../../include/enotify.php:138 #: ../../include/enotify.php:152
#, php-format #, php-format
msgid "%1$s tagged your post at %2$s" msgid "%1$s tagged your post at %2$s"
msgstr "" msgstr ""
#: ../../include/enotify.php:139 #: ../../include/enotify.php:153
#, php-format #, php-format
msgid "%1$s tagged [url=%2$s]your post[/url]" msgid "%1$s tagged [url=%2$s]your post[/url]"
msgstr "" msgstr ""
#: ../../include/enotify.php:150
msgid "[Friendica:Notify] Introduction received"
msgstr ""
#: ../../include/enotify.php:151
#, php-format
msgid "You've received an introduction from '%1$s' at %2$s"
msgstr ""
#: ../../include/enotify.php:152
#, php-format
msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
msgstr ""
#: ../../include/enotify.php:155 ../../include/enotify.php:173
#, php-format
msgid "You may visit their profile at %s"
msgstr ""
#: ../../include/enotify.php:157
#, php-format
msgid "Please visit %s to approve or reject the introduction."
msgstr ""
#: ../../include/enotify.php:164 #: ../../include/enotify.php:164
msgid "[Friendica:Notify] Friend suggestion received" msgid "[Friendica:Notify] Introduction received"
msgstr "" msgstr ""
#: ../../include/enotify.php:165 #: ../../include/enotify.php:165
#, php-format #, php-format
msgid "You've received a friend suggestion from '%1$s' at %2$s" msgid "You've received an introduction from '%1$s' at %2$s"
msgstr "" msgstr ""
#: ../../include/enotify.php:166 #: ../../include/enotify.php:166
#, php-format #, php-format
msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
msgstr ""
#: ../../include/enotify.php:169 ../../include/enotify.php:187
#, php-format
msgid "You may visit their profile at %s"
msgstr "" msgstr ""
#: ../../include/enotify.php:171 #: ../../include/enotify.php:171
#, php-format
msgid "Please visit %s to approve or reject the introduction."
msgstr ""
#: ../../include/enotify.php:178
msgid "[Friendica:Notify] Friend suggestion received"
msgstr ""
#: ../../include/enotify.php:179
#, php-format
msgid "You've received a friend suggestion from '%1$s' at %2$s"
msgstr ""
#: ../../include/enotify.php:180
#, php-format
msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
msgstr ""
#: ../../include/enotify.php:185
msgid "Name:" msgid "Name:"
msgstr "" msgstr ""
#: ../../include/enotify.php:172 #: ../../include/enotify.php:186
msgid "Photo:" msgid "Photo:"
msgstr "" msgstr ""
#: ../../include/enotify.php:175 #: ../../include/enotify.php:189
#, php-format #, php-format
msgid "Please visit %s to approve or reject the suggestion." msgid "Please visit %s to approve or reject the suggestion."
msgstr "" msgstr ""
@ -7655,96 +7659,96 @@ msgstr ""
msgid "This action is not available under your subscription plan." msgid "This action is not available under your subscription plan."
msgstr "" msgstr ""
#: ../../boot.php:527 #: ../../boot.php:545
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:530 #: ../../boot.php:548
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:725 #: ../../boot.php:743
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:727 #: ../../boot.php:745
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:827 #: ../../boot.php:845
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:851 #: ../../boot.php:869
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:852 #: ../../boot.php:870
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:855 #: ../../boot.php:873
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:861 #: ../../boot.php:879
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:1028 #: ../../boot.php:1046
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1088 #: ../../boot.php:1106
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1204 ../../boot.php:1283 #: ../../boot.php:1222 ../../boot.php:1301
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1205 ../../boot.php:1284 #: ../../boot.php:1223 ../../boot.php:1302
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1250 ../../boot.php:1324 #: ../../boot.php:1268 ../../boot.php:1342
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1262 #: ../../boot.php:1280
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1263 #: ../../boot.php:1281
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1317 #: ../../boot.php:1335
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1335 #: ../../boot.php:1353
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1336 #: ../../boot.php:1354
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1541 #: ../../boot.php:1559
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1547 #: ../../boot.php:1565
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1562 #: ../../boot.php:1580
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1568 #: ../../boot.php:1586
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""