keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improved db error logging

Browse source
This commit is contained in:
friendica 2012-04-29 17:34:54 -07:00
parent def6f0b408
commit e3fecb2557
3 changed files with 157 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,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', '2.3.1326' ); define ( 'FRIENDICA_VERSION', '2.3.1327' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1140 ); define ( 'DB_UPDATE_VERSION', 1140 );

26
include/dba.php
View file

@ -74,23 +74,29 @@ class dba {
if((! $this->db) || (! $this->connected)) if((! $this->db) || (! $this->connected))
return false; return false;
$this->error = '';
if($this->mysqli) if($this->mysqli)
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
else else
$result = @mysql_query($sql,$this->db); $result = @mysql_query($sql,$this->db);
if($this->mysqli) {
if($this->db->errno)
$this->error = $this->db->error;
}
elseif(mysql_errno($this->db))
$this->error = mysql_error($this->db);
if(strlen($this->error)) {
logger('dba: ' . $this->error);
}
if($this->debug) { if($this->debug) {
$mesg = ''; $mesg = '';
if($this->mysqli) {
if($this->db->errno)
logger('dba: ' . $this->db->error);
}
elseif(mysql_errno($this->db))
logger('dba: ' . mysql_error($this->db));
if($result === false) if($result === false)
$mesg = 'false'; $mesg = 'false';
elseif($result === true) elseif($result === true)
@ -102,7 +108,9 @@ class dba {
$mesg = mysql_num_rows($result) . ' results' . EOL; $mesg = mysql_num_rows($result) . ' results' . EOL;
} }
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
. (($this->error) ? ' error: ' . $this->error : '')
. EOL;
logger('dba: ' . $str ); logger('dba: ' . $str );
} }
@ -116,7 +124,7 @@ class dba {
if($result === false) { if($result === false) {
logger('dba: ' . printable($sql) . ' returned false.'); logger('dba: ' . printable($sql) . ' returned false.');
if(file_exists('dbfail.out')) if(file_exists('dbfail.out'))
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND); file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
} }
if(($result === true) || ($result === false)) if(($result === true) || ($result === false))

253
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1326\n" "Project-Id-Version: 2.3.1327\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-28 10:00-0700\n" "POT-Creation-Date: 2012-04-29 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"
@ -52,7 +52,7 @@ msgstr ""
#: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/message.php:90 ../../mod/allfriends.php:9
#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/profiles.php:7 ../../mod/profiles.php:365
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171 #: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
@ -132,7 +132,7 @@ msgstr ""
#: ../../mod/settings.php:744 ../../mod/settings.php:935 #: ../../mod/settings.php:744 ../../mod/settings.php:935
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393
#: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907 #: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907
#: ../../mod/admin.php:995 ../../mod/profiles.php:498 ../../mod/invite.php:119 #: ../../mod/admin.php:995 ../../mod/profiles.php:534 ../../mod/invite.php:119
#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 #: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/planets/planets.php:158 #: ../../addon/planets/planets.php:158
@ -220,7 +220,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 #: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255
#: ../../include/nav.php:52 ../../boot.php:1481 #: ../../include/nav.php:52 ../../boot.php:1487
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -270,7 +270,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37 #: ../../mod/events.php:395 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1083 #: ../../include/bb2diaspora.php:260 ../../boot.php:1089
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -330,7 +330,7 @@ msgstr ""
#: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:884 ../../mod/settings.php:890
#: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:926 ../../mod/settings.php:927
#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/settings.php:928 ../../mod/settings.php:929
#: ../../mod/register.php:532 ../../mod/profiles.php:475 #: ../../mod/register.php:532 ../../mod/profiles.php:511
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -341,7 +341,7 @@ msgstr ""
#: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:884 ../../mod/settings.php:890
#: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:926 ../../mod/settings.php:927
#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/settings.php:928 ../../mod/settings.php:929
#: ../../mod/register.php:533 ../../mod/profiles.php:476 #: ../../mod/register.php:533 ../../mod/profiles.php:512
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -545,7 +545,7 @@ msgstr ""
#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1232 ../../mod/photos.php:1272
#: ../../mod/photos.php:1303 ../../include/conversation.php:554 #: ../../mod/photos.php:1303 ../../include/conversation.php:554
#: ../../boot.php:495 #: ../../boot.php:503
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -1166,7 +1166,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:1027 #: ../../include/contact_widgets.php:9 ../../boot.php:1033
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1648,6 +1648,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:650 #: ../../addon/facebook/facebook.php:650
#: ../../addon/facebook/facebook.php:1139 #: ../../addon/facebook/facebook.php:1139
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
#: ../../boot.php:683
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1657,7 +1658,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:809 #: ../../mod/lostpass.php:83 ../../boot.php:815
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2279,7 +2280,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1486 #: ../../mod/notes.php:44 ../../boot.php:1492
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2530,7 +2531,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1468 #: ../../include/nav.php:50 ../../boot.php:1474
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2702,7 +2703,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775 #: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:781
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2745,7 +2746,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254
#: ../../include/nav.php:51 ../../boot.php:1473 #: ../../include/nav.php:51 ../../boot.php:1479
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3451,7 +3452,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:940 #: ../../mod/profile.php:21 ../../boot.php:946
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -3595,8 +3596,8 @@ msgstr ""
msgid "Search This Site" msgid "Search This Site"
msgstr "" msgstr ""
#: ../../mod/profiles.php:21 ../../mod/profiles.php:339 #: ../../mod/profiles.php:21 ../../mod/profiles.php:375
#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62 #: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62
msgid "Profile not found." msgid "Profile not found."
msgstr "" msgstr ""
@ -3604,259 +3605,273 @@ msgstr ""
msgid "Profile Name is required." msgid "Profile Name is required."
msgstr "" msgstr ""
#: ../../mod/profiles.php:143 #: ../../mod/profiles.php:145
msgid "Marital Status" msgid "Marital Status"
msgstr "" msgstr ""
#: ../../mod/profiles.php:144 #: ../../mod/profiles.php:149
msgid "Romantic Partner" msgid "Romantic Partner"
msgstr "" msgstr ""
#: ../../mod/profiles.php:145 #: ../../mod/profiles.php:153
msgid "Work/Employment" msgid "Work/Employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:146 #: ../../mod/profiles.php:156
msgid "Religion" msgid "Religion"
msgstr "" msgstr ""
#: ../../mod/profiles.php:147 #: ../../mod/profiles.php:160
msgid "Political Views" msgid "Political Views"
msgstr "" msgstr ""
#: ../../mod/profiles.php:148 #: ../../mod/profiles.php:164
msgid "Gender" msgid "Gender"
msgstr "" msgstr ""
#: ../../mod/profiles.php:149 #: ../../mod/profiles.php:168
msgid "Sexual Preference" msgid "Sexual Preference"
msgstr "" msgstr ""
#: ../../mod/profiles.php:150 #: ../../mod/profiles.php:172
msgid "Homepage" msgid "Homepage"
msgstr "" msgstr ""
#: ../../mod/profiles.php:151 #: ../../mod/profiles.php:176
msgid "Interests" msgid "Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:154 #: ../../mod/profiles.php:181
msgid "Location" msgid "Location"
msgstr "" msgstr ""
#: ../../mod/profiles.php:225 #: ../../mod/profiles.php:253
msgid "Profile updated." msgid "Profile updated."
msgstr "" msgstr ""
#: ../../mod/profiles.php:300 #: ../../mod/profiles.php:320
msgid " and "
msgstr ""
#: ../../mod/profiles.php:328
msgid "public profile" msgid "public profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:302 #: ../../mod/profiles.php:331
#, php-format
msgid "%1$s changed %2$s to %3$s"
msgstr ""
#: ../../mod/profiles.php:332
#, php-format
msgid " - Visit %1$s's %2$s"
msgstr ""
#: ../../mod/profiles.php:335
#, php-format #, php-format
msgid "%1$s has an updated %2$s, changing %3$s." msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "" msgstr ""
#: ../../mod/profiles.php:358 #: ../../mod/profiles.php:394
msgid "Profile deleted." msgid "Profile deleted."
msgstr "" msgstr ""
#: ../../mod/profiles.php:376 ../../mod/profiles.php:410 #: ../../mod/profiles.php:412 ../../mod/profiles.php:446
msgid "Profile-" msgid "Profile-"
msgstr "" msgstr ""
#: ../../mod/profiles.php:395 ../../mod/profiles.php:437 #: ../../mod/profiles.php:431 ../../mod/profiles.php:473
msgid "New profile created." msgid "New profile created."
msgstr "" msgstr ""
#: ../../mod/profiles.php:416 #: ../../mod/profiles.php:452
msgid "Profile unavailable to clone." msgid "Profile unavailable to clone."
msgstr "" msgstr ""
#: ../../mod/profiles.php:474 #: ../../mod/profiles.php:510
msgid "Hide your contact/friend list from viewers of this profile?" msgid "Hide your contact/friend list from viewers of this profile?"
msgstr "" msgstr ""
#: ../../mod/profiles.php:497 #: ../../mod/profiles.php:533
msgid "Edit Profile Details" msgid "Edit Profile Details"
msgstr "" msgstr ""
#: ../../mod/profiles.php:499 #: ../../mod/profiles.php:535
msgid "View this profile" msgid "View this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:500 #: ../../mod/profiles.php:536
msgid "Create a new profile using these settings" msgid "Create a new profile using these settings"
msgstr "" msgstr ""
#: ../../mod/profiles.php:501 #: ../../mod/profiles.php:537
msgid "Clone this profile" msgid "Clone this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:502 #: ../../mod/profiles.php:538
msgid "Delete this profile" msgid "Delete this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:503 #: ../../mod/profiles.php:539
msgid "Profile Name:" msgid "Profile Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:504 #: ../../mod/profiles.php:540
msgid "Your Full Name:" msgid "Your Full Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:505 #: ../../mod/profiles.php:541
msgid "Title/Description:" msgid "Title/Description:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:506 #: ../../mod/profiles.php:542
msgid "Your Gender:" msgid "Your Gender:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:507 #: ../../mod/profiles.php:543
#, php-format #, php-format
msgid "Birthday (%s):" msgid "Birthday (%s):"
msgstr "" msgstr ""
#: ../../mod/profiles.php:508 #: ../../mod/profiles.php:544
msgid "Street Address:" msgid "Street Address:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:509 #: ../../mod/profiles.php:545
msgid "Locality/City:" msgid "Locality/City:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:510 #: ../../mod/profiles.php:546
msgid "Postal/Zip Code:" msgid "Postal/Zip Code:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:511 #: ../../mod/profiles.php:547
msgid "Country:" msgid "Country:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:512 #: ../../mod/profiles.php:548
msgid "Region/State:" msgid "Region/State:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:513 #: ../../mod/profiles.php:549
msgid "<span class=\"heart\">&hearts;</span> Marital Status:" msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:514 #: ../../mod/profiles.php:550
msgid "Who: (if applicable)" msgid "Who: (if applicable)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:515 #: ../../mod/profiles.php:551
msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "" msgstr ""
#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43 #: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
msgid "Sexual Preference:" msgid "Sexual Preference:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:517 #: ../../mod/profiles.php:553
msgid "Homepage URL:" msgid "Homepage URL:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49 #: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
msgid "Political Views:" msgid "Political Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:519 #: ../../mod/profiles.php:555
msgid "Religious Views:" msgid "Religious Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:520 #: ../../mod/profiles.php:556
msgid "Public Keywords:" msgid "Public Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:521 #: ../../mod/profiles.php:557
msgid "Private Keywords:" msgid "Private Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:522 #: ../../mod/profiles.php:558
msgid "Example: fishing photography software" msgid "Example: fishing photography software"
msgstr "" msgstr ""
#: ../../mod/profiles.php:523 #: ../../mod/profiles.php:559
msgid "(Used for suggesting potential friends, can be seen by others)" msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:524 #: ../../mod/profiles.php:560
msgid "(Used for searching profiles, never shown to others)" msgid "(Used for searching profiles, never shown to others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:525 #: ../../mod/profiles.php:561
msgid "Tell us about yourself..." msgid "Tell us about yourself..."
msgstr "" msgstr ""
#: ../../mod/profiles.php:526 #: ../../mod/profiles.php:562
msgid "Hobbies/Interests" msgid "Hobbies/Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:527 #: ../../mod/profiles.php:563
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" msgstr ""
#: ../../mod/profiles.php:528 #: ../../mod/profiles.php:564
msgid "Musical interests" msgid "Musical interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:529 #: ../../mod/profiles.php:565
msgid "Books, literature" msgid "Books, literature"
msgstr "" msgstr ""
#: ../../mod/profiles.php:530 #: ../../mod/profiles.php:566
msgid "Television" msgid "Television"
msgstr "" msgstr ""
#: ../../mod/profiles.php:531 #: ../../mod/profiles.php:567
msgid "Film/dance/culture/entertainment" msgid "Film/dance/culture/entertainment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:532 #: ../../mod/profiles.php:568
msgid "Love/romance" msgid "Love/romance"
msgstr "" msgstr ""
#: ../../mod/profiles.php:533 #: ../../mod/profiles.php:569
msgid "Work/employment" msgid "Work/employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:534 #: ../../mod/profiles.php:570
msgid "School/education" msgid "School/education"
msgstr "" msgstr ""
#: ../../mod/profiles.php:539 #: ../../mod/profiles.php:575
msgid "" msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet." "be visible to anybody using the internet."
msgstr "" msgstr ""
#: ../../mod/profiles.php:549 ../../mod/directory.php:111 #: ../../mod/profiles.php:585 ../../mod/directory.php:111
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: ../../mod/profiles.php:584 #: ../../mod/profiles.php:620
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:585 ../../boot.php:1049 #: ../../mod/profiles.php:621 ../../boot.php:1055
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:586 ../../boot.php:1050 #: ../../mod/profiles.php:622 ../../boot.php:1056
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:597 ../../boot.php:1060 #: ../../mod/profiles.php:633 ../../boot.php:1066
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:599 ../../boot.php:1063 #: ../../mod/profiles.php:635 ../../boot.php:1069
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:600 ../../boot.php:1064 #: ../../mod/profiles.php:636 ../../boot.php:1070
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4457,7 +4472,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:796 #: ../../include/nav.php:64 ../../boot.php:802
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -5199,7 +5214,7 @@ msgid "Show More Settings saved."
msgstr "" msgstr ""
#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
#: ../../boot.php:496 #: ../../boot.php:504
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -5503,7 +5518,7 @@ msgstr ""
msgid "Set colour scheme" msgid "Set colour scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1085 #: ../../include/profile_advanced.php:17 ../../boot.php:1091
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5524,11 +5539,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1088 #: ../../include/profile_advanced.php:37 ../../boot.php:1094
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1090 #: ../../include/profile_advanced.php:45 ../../boot.php:1096
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -6112,7 +6127,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:795 #: ../../include/nav.php:46 ../../boot.php:801
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -6120,7 +6135,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1463 #: ../../include/nav.php:49 ../../boot.php:1469
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6200,11 +6215,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1043 #: ../../include/nav.php:138 ../../boot.php:1049
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1043 #: ../../include/nav.php:138 ../../boot.php:1049
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -6626,33 +6641,33 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it." "form has been opened for too long (>3 hours) before submitting it."
msgstr "" msgstr ""
#: ../../include/Contact.php:96 #: ../../include/Contact.php:111
msgid "stopped following" msgid "stopped following"
msgstr "" msgstr ""
#: ../../include/Contact.php:188 ../../include/conversation.php:817 #: ../../include/Contact.php:203 ../../include/conversation.php:817
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: ../../include/Contact.php:189 ../../include/conversation.php:818 #: ../../include/Contact.php:204 ../../include/conversation.php:818
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: ../../include/Contact.php:190 ../../include/conversation.php:819 #: ../../include/Contact.php:205 ../../include/conversation.php:819
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: ../../include/Contact.php:191 ../../include/Contact.php:204 #: ../../include/Contact.php:206 ../../include/Contact.php:219
#: ../../include/conversation.php:820 #: ../../include/conversation.php:820
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: ../../include/Contact.php:192 ../../include/Contact.php:204 #: ../../include/Contact.php:207 ../../include/Contact.php:219
#: ../../include/conversation.php:821 #: ../../include/conversation.php:821
msgid "Edit Contact" msgid "Edit Contact"
msgstr "" msgstr ""
#: ../../include/Contact.php:193 ../../include/Contact.php:204 #: ../../include/Contact.php:208 ../../include/Contact.php:219
#: ../../include/conversation.php:822 #: ../../include/conversation.php:822
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -6879,70 +6894,80 @@ msgstr ""
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
#: ../../boot.php:494 #: ../../boot.php:502
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:497 #: ../../boot.php:505
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:774 #: ../../boot.php:678
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
#: ../../boot.php:680
#, php-format
msgid "Update Error at %s"
msgstr ""
#: ../../boot.php:780
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:798 #: ../../boot.php:804
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:799 #: ../../boot.php:805
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:802 #: ../../boot.php:808
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:808 #: ../../boot.php:814
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:975 #: ../../boot.php:981
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1035 #: ../../boot.php:1041
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1151 ../../boot.php:1227 #: ../../boot.php:1157 ../../boot.php:1233
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1152 ../../boot.php:1228 #: ../../boot.php:1158 ../../boot.php:1234
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1197 ../../boot.php:1268 #: ../../boot.php:1203 ../../boot.php:1274
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1209 #: ../../boot.php:1215
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1210 #: ../../boot.php:1216
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1261 #: ../../boot.php:1267
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1279 #: ../../boot.php:1285
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1280 #: ../../boot.php:1286
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""