From: friendica <info@friendica.com>
Date: Tue, 14 May 2013 00:22:07 +0000 (-0700)
Subject: check_config is gone - use check_db
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0ce68665c6f2fa68809c82ee5e8493326cbda1c7;p=friendica.git

check_config is gone - use check_db
---

diff --git a/boot.php b/boot.php
index 65e3d1384d..3c55c377c8 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1697' );
+define ( 'FRIENDICA_VERSION',      '3.1.1699' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/util/db_update.php b/util/db_update.php
index ef85606ccb..32b44e6d00 100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -26,7 +26,7 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
 
 if($build != DB_UPDATE_VERSION) {
 	echo "Updating database...";
-	check_config($a);
+	check_db($a);
 	echo "Done\n";
 }
 
diff --git a/util/messages.po b/util/messages.po
index 1ef893ac7c..f5528e1577 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1697\n"
+"Project-Id-Version: 3.1.1699\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-11 00:02-0700\n"
+"POT-Creation-Date: 2013-05-13 00:03-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"
@@ -401,1077 +401,1081 @@ msgstr ""
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/text.php:294
-msgid "prev"
+#: ../../include/acl_selectors.php:325
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:296
-msgid "first"
+#: ../../include/acl_selectors.php:326 ../../view/theme/diabook/config.php:146
+#: ../../view/theme/diabook/theme.php:629
+msgid "show"
 msgstr ""
 
-#: ../../include/text.php:325
-msgid "last"
+#: ../../include/acl_selectors.php:327 ../../view/theme/diabook/config.php:146
+#: ../../view/theme/diabook/theme.php:629
+msgid "don't show"
 msgstr ""
 
-#: ../../include/text.php:328
-msgid "next"
+#: ../../include/auth.php:38
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/text.php:352
-msgid "newer"
+#: ../../include/auth.php:112 ../../include/auth.php:175
+#: ../../mod/openid.php:93
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/text.php:356
-msgid "older"
+#: ../../include/auth.php:128
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/text.php:807
-msgid "No contacts"
+#: ../../include/auth.php:128
+msgid "The error message was:"
 msgstr ""
 
-#: ../../include/text.php:816
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
-msgid "View Contacts"
+#: ../../include/bb2diaspora.php:393 ../../include/event.php:11
+#: ../../mod/localtime.php:12
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/text.php:905 ../../include/text.php:906
-#: ../../include/nav.php:118 ../../mod/search.php:99
-msgid "Search"
+#: ../../include/bb2diaspora.php:399 ../../include/event.php:20
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
-msgid "Save"
+#: ../../include/bb2diaspora.php:407 ../../include/event.php:30
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/text.php:957
-msgid "poke"
+#: ../../include/bb2diaspora.php:415 ../../include/event.php:40
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
+msgid "Location:"
 msgstr ""
 
-#: ../../include/text.php:957 ../../include/conversation.php:211
-msgid "poked"
+#: ../../include/follow.php:27 ../../mod/dfrn_request.php:502
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../include/text.php:958
-msgid "ping"
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
 msgstr ""
 
-#: ../../include/text.php:958
-msgid "pinged"
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../include/text.php:959
-msgid "prod"
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../include/text.php:959
-msgid "prodded"
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../include/text.php:960
-msgid "slap"
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
 msgstr ""
 
-#: ../../include/text.php:960
-msgid "slapped"
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../include/text.php:961
-msgid "finger"
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
 msgstr ""
 
-#: ../../include/text.php:961
-msgid "fingered"
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: ../../include/text.php:962
-msgid "rebuff"
+#: ../../include/follow.php:93
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: ../../include/text.php:962
-msgid "rebuffed"
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../include/text.php:976
-msgid "happy"
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../include/text.php:977
-msgid "sad"
+#: ../../include/follow.php:259
+msgid "following"
 msgstr ""
 
-#: ../../include/text.php:978
-msgid "mellow"
+#: ../../include/user.php:39
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/text.php:979
-msgid "tired"
+#: ../../include/user.php:44
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/text.php:980
-msgid "perky"
+#: ../../include/user.php:52
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../include/text.php:981
-msgid "angry"
+#: ../../include/user.php:67
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/text.php:982
-msgid "stupified"
+#: ../../include/user.php:81
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../include/text.php:983
-msgid "puzzled"
+#: ../../include/user.php:83
+msgid "Name too short."
 msgstr ""
 
-#: ../../include/text.php:984
-msgid "interested"
+#: ../../include/user.php:98
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../include/text.php:985
-msgid "bitter"
+#: ../../include/user.php:103
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../include/text.php:986
-msgid "cheerful"
+#: ../../include/user.php:106
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../include/text.php:987
-msgid "alive"
+#: ../../include/user.php:116
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../include/text.php:988
-msgid "annoyed"
+#: ../../include/user.php:122
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../include/text.php:989
-msgid "anxious"
+#: ../../include/user.php:128 ../../include/user.php:226
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../include/text.php:990
-msgid "cranky"
+#: ../../include/user.php:138
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
 msgstr ""
 
-#: ../../include/text.php:991
-msgid "disturbed"
+#: ../../include/user.php:154
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../include/text.php:992
-msgid "frustrated"
+#: ../../include/user.php:212
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../include/text.php:993
-msgid "motivated"
+#: ../../include/user.php:237 ../../include/text.php:1594
+msgid "default"
 msgstr ""
 
-#: ../../include/text.php:994
-msgid "relaxed"
+#: ../../include/user.php:247
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../include/text.php:995
-msgid "surprised"
+#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../include/user.php:339 ../../mod/photos.php:154
+#: ../../mod/photos.php:725 ../../mod/photos.php:1183
+#: ../../mod/photos.php:1206 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
+#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
+#: ../../mod/profile_photo.php:305 ../../view/theme/diabook/theme.php:493
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Monday"
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Tuesday"
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Wednesday"
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Thursday"
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Friday"
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Saturday"
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
 msgstr ""
 
-#: ../../include/text.php:1161
-msgid "Sunday"
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:452
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "January"
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:453
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "February"
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:454
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "March"
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:455
+msgid "Daily"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "April"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "May"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "June"
+#: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:840
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "July"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "August"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "September"
+#: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:766
+#: ../../mod/admin.php:777
+msgid "Email"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "October"
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:705
+#: ../../mod/dfrn_request.php:842
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "November"
+#: ../../include/contact_selectors.php:81 ../../mod/newmember.php:49
+#: ../../mod/newmember.php:51
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/text.php:1165
-msgid "December"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
 msgstr ""
 
-#: ../../include/text.php:1322
-msgid "bytes"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/text.php:1349 ../../include/text.php:1361
-msgid "Click to open/close"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/text.php:1523 ../../mod/events.php:335
-msgid "link to source"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/text.php:1566 ../../include/user.php:237
-msgid "default"
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
 msgstr ""
 
-#: ../../include/text.php:1578
-msgid "Select an alternate language"
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
 msgstr ""
 
-#: ../../include/text.php:1830 ../../include/conversation.php:118
-#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
-msgid "event"
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
 msgstr ""
 
-#: ../../include/text.php:1832 ../../include/diaspora.php:1874
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
-#: ../../view/theme/diabook/theme.php:464
-msgid "photo"
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/text.php:1834
-msgid "activity"
+#: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
+#: ../../mod/match.php:58 ../../boot.php:1416
+msgid "Connect"
 msgstr ""
 
-#: ../../include/text.php:1836 ../../mod/content.php:628
-#: ../../object/Item.php:364 ../../object/Item.php:377
-msgid "comment"
-msgid_plural "comments"
+#: ../../include/contact_widgets.php:23
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:1837
-msgid "post"
+#: ../../include/contact_widgets.php:29
+msgid "Find People"
 msgstr ""
 
-#: ../../include/text.php:1992
-msgid "Item filed"
+#: ../../include/contact_widgets.php:30
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/acl_selectors.php:325
-msgid "Visible to everybody"
+#: ../../include/contact_widgets.php:31
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/acl_selectors.php:326 ../../view/theme/diabook/config.php:146
-#: ../../view/theme/diabook/theme.php:629
-msgid "show"
+#: ../../include/contact_widgets.php:32
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/acl_selectors.php:327 ../../view/theme/diabook/config.php:146
-#: ../../view/theme/diabook/theme.php:629
-msgid "don't show"
+#: ../../include/contact_widgets.php:33 ../../mod/contacts.php:613
+#: ../../mod/directory.php:61
+msgid "Find"
 msgstr ""
 
-#: ../../include/auth.php:38
-msgid "Logged out."
+#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:66
+#: ../../view/theme/diabook/theme.php:520
+msgid "Friend Suggestions"
 msgstr ""
 
-#: ../../include/auth.php:112 ../../include/auth.php:175
-#: ../../mod/openid.php:93
-msgid "Login failed."
+#: ../../include/contact_widgets.php:35 ../../view/theme/diabook/theme.php:519
+msgid "Similar Interests"
 msgstr ""
 
-#: ../../include/auth.php:128
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+#: ../../include/contact_widgets.php:36
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/auth.php:128
-msgid "The error message was:"
+#: ../../include/contact_widgets.php:37 ../../view/theme/diabook/theme.php:521
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:393 ../../include/event.php:11
-#: ../../mod/localtime.php:12
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/contact_widgets.php:70
+msgid "Networks"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:399 ../../include/event.php:20
-msgid "Starts:"
+#: ../../include/contact_widgets.php:73
+msgid "All Networks"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:407 ../../include/event.php:30
-msgid "Finishes:"
+#: ../../include/contact_widgets.php:103 ../../include/features.php:59
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484
-msgid "Location:"
+#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
+msgid "Everything"
 msgstr ""
 
-#: ../../include/follow.php:27 ../../mod/dfrn_request.php:502
-msgid "Disallowed profile URL."
+#: ../../include/contact_widgets.php:135
+msgid "Categories"
 msgstr ""
 
-#: ../../include/follow.php:32
-msgid "Connect URL missing."
+#: ../../include/contact_widgets.php:199 ../../mod/contacts.php:343
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:204 ../../mod/content.php:629
+#: ../../object/Item.php:365 ../../boot.php:670
+msgid "show more"
 msgstr ""
 
-#: ../../include/follow.php:59
-msgid ""
-"This site is not configured to allow communications with other networks."
+#: ../../include/Scrape.php:583
+msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/follow.php:60 ../../include/follow.php:80
-msgid "No compatible communication protocols or feeds were discovered."
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/follow.php:78
-msgid "The profile address specified does not provide adequate information."
+#: ../../include/bbcode.php:272
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>"
 msgstr ""
 
-#: ../../include/follow.php:82
-msgid "An author or name was not found."
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/follow.php:84
-msgid "No browser URL could be matched to this address."
+#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/follow.php:86
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
+#: ../../include/network.php:877
+msgid "view full size"
 msgstr ""
 
-#: ../../include/follow.php:87
-msgid "Use mailto: in front of address to force email check."
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/follow.php:93
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: ../../include/datetime.php:153 ../../include/datetime.php:285
+msgid "year"
 msgstr ""
 
-#: ../../include/follow.php:103
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../include/datetime.php:158 ../../include/datetime.php:286
+msgid "month"
 msgstr ""
 
-#: ../../include/follow.php:205
-msgid "Unable to retrieve contact information."
+#: ../../include/datetime.php:163 ../../include/datetime.php:288
+msgid "day"
 msgstr ""
 
-#: ../../include/follow.php:259
-msgid "following"
+#: ../../include/datetime.php:276
+msgid "never"
 msgstr ""
 
-#: ../../include/user.php:39
-msgid "An invitation is required."
+#: ../../include/datetime.php:282
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/user.php:44
-msgid "Invitation could not be verified."
+#: ../../include/datetime.php:285
+msgid "years"
 msgstr ""
 
-#: ../../include/user.php:52
-msgid "Invalid OpenID url"
+#: ../../include/datetime.php:286
+msgid "months"
 msgstr ""
 
-#: ../../include/user.php:67
-msgid "Please enter the required information."
+#: ../../include/datetime.php:287
+msgid "week"
 msgstr ""
 
-#: ../../include/user.php:81
-msgid "Please use a shorter name."
+#: ../../include/datetime.php:287
+msgid "weeks"
 msgstr ""
 
-#: ../../include/user.php:83
-msgid "Name too short."
+#: ../../include/datetime.php:288
+msgid "days"
 msgstr ""
 
-#: ../../include/user.php:98
-msgid "That doesn't appear to be your full (First Last) name."
+#: ../../include/datetime.php:289
+msgid "hour"
 msgstr ""
 
-#: ../../include/user.php:103
-msgid "Your email domain is not among those allowed on this site."
+#: ../../include/datetime.php:289
+msgid "hours"
 msgstr ""
 
-#: ../../include/user.php:106
-msgid "Not a valid email address."
+#: ../../include/datetime.php:290
+msgid "minute"
 msgstr ""
 
-#: ../../include/user.php:116
-msgid "Cannot use that email."
+#: ../../include/datetime.php:290
+msgid "minutes"
 msgstr ""
 
-#: ../../include/user.php:122
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+#: ../../include/datetime.php:291
+msgid "second"
 msgstr ""
 
-#: ../../include/user.php:128 ../../include/user.php:226
-msgid "Nickname is already registered. Please choose another."
+#: ../../include/datetime.php:291
+msgid "seconds"
 msgstr ""
 
-#: ../../include/user.php:138
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
+#: ../../include/datetime.php:300
+#, php-format
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/user.php:154
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../include/datetime.php:472 ../../include/items.php:1813
+#, php-format
+msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/user.php:212
-msgid "An error occurred during registration. Please try again."
+#: ../../include/datetime.php:473 ../../include/items.php:1814
+#, php-format
+msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/user.php:247
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../include/plugin.php:439 ../../include/plugin.php:441
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/user.php:325 ../../include/user.php:332
-#: ../../include/user.php:339 ../../mod/photos.php:154
-#: ../../mod/photos.php:725 ../../mod/photos.php:1183
-#: ../../mod/photos.php:1206 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
-#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
-#: ../../mod/profile_photo.php:305 ../../view/theme/diabook/theme.php:493
-msgid "Profile Photos"
+#: ../../include/plugin.php:447
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
+#: ../../include/plugin.php:452
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
+#: ../../include/delivery.php:457 ../../include/notifier.php:775
+msgid "(no subject)"
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: ../../include/delivery.php:468 ../../include/enotify.php:28
+#: ../../include/notifier.php:785
+msgid "noreply"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: ../../include/diaspora.php:621 ../../include/conversation.php:172
+#: ../../mod/dfrn_confirm.php:477
+#, php-format
+msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
+#: ../../include/diaspora.php:704
+msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
+#: ../../include/diaspora.php:1874 ../../include/text.php:1860
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
+#: ../../view/theme/diabook/theme.php:464
+msgid "photo"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56 ../../mod/admin.php:452
-msgid "Frequently"
+#: ../../include/diaspora.php:1874 ../../include/conversation.php:121
+#: ../../include/conversation.php:130 ../../include/conversation.php:249
+#: ../../include/conversation.php:258 ../../mod/subthread.php:87
+#: ../../mod/tagger.php:62 ../../mod/like.php:151 ../../mod/like.php:322
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468
+msgid "status"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57 ../../mod/admin.php:453
-msgid "Hourly"
+#: ../../include/diaspora.php:1890 ../../include/conversation.php:137
+#: ../../mod/like.php:168 ../../view/theme/diabook/theme.php:473
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58 ../../mod/admin.php:454
-msgid "Twice daily"
+#: ../../include/diaspora.php:2262
+msgid "Attachments:"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59 ../../mod/admin.php:455
-msgid "Daily"
+#: ../../include/items.php:3488 ../../mod/dfrn_request.php:716
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/items.php:3495
+msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/items.php:3495
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:840
-msgid "Friendica"
+#: ../../include/items.php:3979 ../../mod/display.php:51
+#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
+#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
+#: ../../include/items.php:4018
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: ../../include/items.php:4020 ../../mod/profiles.php:610
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
+#: ../../mod/settings.php:961 ../../mod/settings.php:967
+#: ../../mod/settings.php:975 ../../mod/settings.php:979
+#: ../../mod/settings.php:984 ../../mod/settings.php:990
+#: ../../mod/settings.php:996 ../../mod/settings.php:1002
+#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
+#: ../../mod/suggest.php:29 ../../mod/message.php:209
+msgid "Yes"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86 ../../mod/admin.php:766
-#: ../../mod/admin.php:777
-msgid "Email"
+#: ../../include/items.php:4023 ../../include/conversation.php:1120
+#: ../../mod/contacts.php:249 ../../mod/settings.php:585
+#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
+#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
+#: ../../mod/photos.php:202 ../../mod/photos.php:290
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:705
-#: ../../mod/dfrn_request.php:842
-msgid "Diaspora"
+#: ../../include/items.php:4143 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
+#: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
+#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
+#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/settings.php:566 ../../mod/settings.php:571
+#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
+#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
+#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
+#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
+#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
+#: ../../mod/network.php:6 ../../mod/notifications.php:66
+#: ../../mod/photos.php:133 ../../mod/photos.php:1044
+#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../index.php:346
+msgid "Permission denied."
 msgstr ""
 
-#: ../../include/contact_selectors.php:81 ../../mod/newmember.php:49
-#: ../../mod/newmember.php:51
-msgid "Facebook"
+#: ../../include/items.php:4213
+msgid "Archives"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
+#: ../../include/features.php:23
+msgid "General Features"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/features.php:30
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/contact_selectors.php:87
-msgid "Google+"
+#: ../../include/features.php:31
+msgid "Richtext Editor"
 msgstr ""
 
-#: ../../include/contact_widgets.php:6
-msgid "Add New Contact"
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
 msgstr ""
 
-#: ../../include/contact_widgets.php:7
-msgid "Enter address or web location"
+#: ../../include/features.php:32
+msgid "Post Preview"
 msgstr ""
 
-#: ../../include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1416
-msgid "Connect"
+#: ../../include/features.php:37
+msgid "Network Sidebar Widgets"
 msgstr ""
 
-#: ../../include/contact_widgets.php:23
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:29
-msgid "Find People"
+#: ../../include/features.php:38
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/contact_widgets.php:30
-msgid "Enter name or interest"
+#: ../../include/features.php:38
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/contact_widgets.php:31
-msgid "Connect/Follow"
+#: ../../include/features.php:39
+msgid "Group Filter"
 msgstr ""
 
-#: ../../include/contact_widgets.php:32
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/features.php:39
+msgid "Enable widget to display Network posts only from selected group"
 msgstr ""
 
-#: ../../include/contact_widgets.php:33 ../../mod/contacts.php:613
-#: ../../mod/directory.php:61
-msgid "Find"
+#: ../../include/features.php:40
+msgid "Network Filter"
 msgstr ""
 
-#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:66
-#: ../../view/theme/diabook/theme.php:520
-msgid "Friend Suggestions"
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected network"
 msgstr ""
 
-#: ../../include/contact_widgets.php:35 ../../view/theme/diabook/theme.php:519
-msgid "Similar Interests"
+#: ../../include/features.php:41 ../../mod/search.php:30
+#: ../../mod/network.php:233
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/contact_widgets.php:36
-msgid "Random Profile"
+#: ../../include/features.php:41
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/contact_widgets.php:37 ../../view/theme/diabook/theme.php:521
-msgid "Invite Friends"
+#: ../../include/features.php:46
+msgid "Network Tabs"
 msgstr ""
 
-#: ../../include/contact_widgets.php:70
-msgid "Networks"
+#: ../../include/features.php:47
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/contact_widgets.php:73
-msgid "All Networks"
+#: ../../include/features.php:47
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/contact_widgets.php:103 ../../include/features.php:59
-msgid "Saved Folders"
+#: ../../include/features.php:48
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
-msgid "Everything"
+#: ../../include/features.php:48
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr ""
 
-#: ../../include/contact_widgets.php:135
-msgid "Categories"
+#: ../../include/features.php:49
+msgid "Network Shared Links Tab"
 msgstr ""
 
-#: ../../include/contact_widgets.php:199 ../../mod/contacts.php:343
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts with links in them"
+msgstr ""
 
-#: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:670
-msgid "show more"
+#: ../../include/features.php:54
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/Scrape.php:583
-msgid " on Last.fm"
+#: ../../include/features.php:55
+msgid "Multiple Deletion"
 msgstr ""
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
-msgid "Image/photo"
+#: ../../include/features.php:55
+msgid "Select and delete multiple posts/comments at once"
 msgstr ""
 
-#: ../../include/bbcode.php:272
-#, php-format
-msgid ""
-"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
-"href=\"%s\" target=\"external-link\">post</a>"
+#: ../../include/features.php:56
+msgid "Edit Sent Posts"
 msgstr ""
 
-#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
-msgid "$1 wrote:"
+#: ../../include/features.php:56
+msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
-msgid "Encrypted content"
+#: ../../include/features.php:57
+msgid "Tagging"
 msgstr ""
 
-#: ../../include/network.php:877
-msgid "view full size"
+#: ../../include/features.php:57
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
+#: ../../include/features.php:58
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/datetime.php:153 ../../include/datetime.php:285
-msgid "year"
+#: ../../include/features.php:58
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/datetime.php:158 ../../include/datetime.php:286
-msgid "month"
+#: ../../include/features.php:59
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/datetime.php:163 ../../include/datetime.php:288
-msgid "day"
+#: ../../include/features.php:60
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/datetime.php:276
-msgid "never"
+#: ../../include/features.php:60
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/datetime.php:282
-msgid "less than a second ago"
+#: ../../include/features.php:61
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/datetime.php:285
-msgid "years"
+#: ../../include/features.php:61
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/datetime.php:286
-msgid "months"
+#: ../../include/dba.php:44
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/datetime.php:287
-msgid "week"
+#: ../../include/text.php:294
+msgid "prev"
 msgstr ""
 
-#: ../../include/datetime.php:287
-msgid "weeks"
+#: ../../include/text.php:296
+msgid "first"
 msgstr ""
 
-#: ../../include/datetime.php:288
-msgid "days"
+#: ../../include/text.php:325
+msgid "last"
 msgstr ""
 
-#: ../../include/datetime.php:289
-msgid "hour"
+#: ../../include/text.php:328
+msgid "next"
 msgstr ""
 
-#: ../../include/datetime.php:289
-msgid "hours"
+#: ../../include/text.php:352
+msgid "newer"
 msgstr ""
 
-#: ../../include/datetime.php:290
-msgid "minute"
+#: ../../include/text.php:356
+msgid "older"
 msgstr ""
 
-#: ../../include/datetime.php:290
-msgid "minutes"
+#: ../../include/text.php:807
+msgid "No contacts"
 msgstr ""
 
-#: ../../include/datetime.php:291
-msgid "second"
+#: ../../include/text.php:816
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
+msgid "View Contacts"
 msgstr ""
 
-#: ../../include/datetime.php:291
-msgid "seconds"
+#: ../../include/text.php:905 ../../include/text.php:906
+#: ../../include/nav.php:118 ../../mod/search.php:99
+msgid "Search"
 msgstr ""
 
-#: ../../include/datetime.php:300
-#, php-format
-msgid "%1$d %2$s ago"
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1813
-#, php-format
-msgid "%s's birthday"
+#: ../../include/text.php:957
+msgid "poke"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1814
-#, php-format
-msgid "Happy Birthday %s"
+#: ../../include/text.php:957 ../../include/conversation.php:211
+msgid "poked"
 msgstr ""
 
-#: ../../include/plugin.php:439 ../../include/plugin.php:441
-msgid "Click here to upgrade."
+#: ../../include/text.php:958
+msgid "ping"
 msgstr ""
 
-#: ../../include/plugin.php:447
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/text.php:958
+msgid "pinged"
 msgstr ""
 
-#: ../../include/plugin.php:452
-msgid "This action is not available under your subscription plan."
+#: ../../include/text.php:959
+msgid "prod"
 msgstr ""
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:775
-msgid "(no subject)"
+#: ../../include/text.php:959
+msgid "prodded"
 msgstr ""
 
-#: ../../include/delivery.php:468 ../../include/enotify.php:28
-#: ../../include/notifier.php:785
-msgid "noreply"
+#: ../../include/text.php:960
+msgid "slap"
 msgstr ""
 
-#: ../../include/diaspora.php:621 ../../include/conversation.php:172
-#: ../../mod/dfrn_confirm.php:477
-#, php-format
-msgid "%1$s is now friends with %2$s"
+#: ../../include/text.php:960
+msgid "slapped"
 msgstr ""
 
-#: ../../include/diaspora.php:704
-msgid "Sharing notification from Diaspora network"
+#: ../../include/text.php:961
+msgid "finger"
 msgstr ""
 
-#: ../../include/diaspora.php:1874 ../../include/conversation.php:121
-#: ../../include/conversation.php:130 ../../include/conversation.php:249
-#: ../../include/conversation.php:258 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../mod/like.php:151 ../../mod/like.php:322
-#: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468
-msgid "status"
+#: ../../include/text.php:961
+msgid "fingered"
 msgstr ""
 
-#: ../../include/diaspora.php:1890 ../../include/conversation.php:137
-#: ../../mod/like.php:168 ../../view/theme/diabook/theme.php:473
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/text.php:962
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/diaspora.php:2262
-msgid "Attachments:"
+#: ../../include/text.php:962
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/items.php:3488 ../../mod/dfrn_request.php:716
-msgid "[Name Withheld]"
+#: ../../include/text.php:976
+msgid "happy"
 msgstr ""
 
-#: ../../include/items.php:3495
-msgid "A new person is sharing with you at "
+#: ../../include/text.php:977
+msgid "sad"
 msgstr ""
 
-#: ../../include/items.php:3495
-msgid "You have a new follower at "
+#: ../../include/text.php:978
+msgid "mellow"
 msgstr ""
 
-#: ../../include/items.php:3979 ../../mod/display.php:51
-#: ../../mod/display.php:246 ../../mod/admin.php:158 ../../mod/admin.php:809
-#: ../../mod/admin.php:1009 ../../mod/viewsrc.php:15 ../../mod/notice.php:15
-msgid "Item not found."
+#: ../../include/text.php:979
+msgid "tired"
 msgstr ""
 
-#: ../../include/items.php:4018
-msgid "Do you really want to delete this item?"
+#: ../../include/text.php:980
+msgid "perky"
 msgstr ""
 
-#: ../../include/items.php:4020 ../../mod/profiles.php:610
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../mod/settings.php:961 ../../mod/settings.php:967
-#: ../../mod/settings.php:975 ../../mod/settings.php:979
-#: ../../mod/settings.php:984 ../../mod/settings.php:990
-#: ../../mod/settings.php:996 ../../mod/settings.php:1002
-#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
-#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
-#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
-msgid "Yes"
+#: ../../include/text.php:981
+msgid "angry"
 msgstr ""
 
-#: ../../include/items.php:4023 ../../include/conversation.php:1120
-#: ../../mod/contacts.php:249 ../../mod/settings.php:585
-#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
-#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
-#: ../../mod/photos.php:202 ../../mod/photos.php:290
-msgid "Cancel"
+#: ../../include/text.php:982
+msgid "stupified"
 msgstr ""
 
-#: ../../include/items.php:4143 ../../mod/profiles.php:146
-#: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
-#: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
-#: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
-#: ../../mod/contacts.php:147 ../../mod/settings.php:91
-#: ../../mod/settings.php:566 ../../mod/settings.php:571
-#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
-#: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
-#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
-#: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/manage.php:96
-#: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
-#: ../../mod/network.php:6 ../../mod/notifications.php:66
-#: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
-#: ../../mod/profile_photo.php:193 ../../index.php:346
-msgid "Permission denied."
+#: ../../include/text.php:983
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/items.php:4213
-msgid "Archives"
+#: ../../include/text.php:984
+msgid "interested"
 msgstr ""
 
-#: ../../include/features.php:23
-msgid "General Features"
+#: ../../include/text.php:985
+msgid "bitter"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Multiple Profiles"
+#: ../../include/text.php:986
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Ability to create multiple profiles"
+#: ../../include/text.php:987
+msgid "alive"
 msgstr ""
 
-#: ../../include/features.php:30
-msgid "Post Composition Features"
+#: ../../include/text.php:988
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/features.php:31
-msgid "Richtext Editor"
+#: ../../include/text.php:989
+msgid "anxious"
 msgstr ""
 
-#: ../../include/features.php:31
-msgid "Enable richtext editor"
+#: ../../include/text.php:990
+msgid "cranky"
 msgstr ""
 
-#: ../../include/features.php:32
-msgid "Post Preview"
+#: ../../include/text.php:991
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/features.php:32
-msgid "Allow previewing posts and comments before publishing them"
+#: ../../include/text.php:992
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/features.php:37
-msgid "Network Sidebar Widgets"
+#: ../../include/text.php:993
+msgid "motivated"
 msgstr ""
 
-#: ../../include/features.php:38
-msgid "Search by Date"
+#: ../../include/text.php:994
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/features.php:38
-msgid "Ability to select posts by date ranges"
+#: ../../include/text.php:995
+msgid "surprised"
 msgstr ""
 
-#: ../../include/features.php:39
-msgid "Group Filter"
+#: ../../include/text.php:1161
+msgid "Monday"
 msgstr ""
 
-#: ../../include/features.php:39
-msgid "Enable widget to display Network posts only from selected group"
+#: ../../include/text.php:1161
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Network Filter"
+#: ../../include/text.php:1161
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Enable widget to display Network posts only from selected network"
+#: ../../include/text.php:1161
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/features.php:41 ../../mod/search.php:30
-#: ../../mod/network.php:233
-msgid "Saved Searches"
+#: ../../include/text.php:1161
+msgid "Friday"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Save search terms for re-use"
+#: ../../include/text.php:1161
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/features.php:46
-msgid "Network Tabs"
+#: ../../include/text.php:1161
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Network Personal Tab"
+#: ../../include/text.php:1165
+msgid "January"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/text.php:1165
+msgid "February"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Network New Tab"
+#: ../../include/text.php:1165
+msgid "March"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+#: ../../include/text.php:1165
+msgid "April"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Network Shared Links Tab"
+#: ../../include/text.php:1165
+msgid "May"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Enable tab to display only Network posts with links in them"
+#: ../../include/text.php:1165
+msgid "June"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Post/Comment Tools"
+#: ../../include/text.php:1165
+msgid "July"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Multiple Deletion"
+#: ../../include/text.php:1165
+msgid "August"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Select and delete multiple posts/comments at once"
+#: ../../include/text.php:1165
+msgid "September"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Edit Sent Posts"
+#: ../../include/text.php:1165
+msgid "October"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Edit and correct posts and comments after sending"
+#: ../../include/text.php:1165
+msgid "November"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Tagging"
+#: ../../include/text.php:1165
+msgid "December"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Ability to tag existing posts"
+#: ../../include/text.php:1321 ../../mod/videos.php:301
+msgid "View Video"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Post Categories"
+#: ../../include/text.php:1353
+msgid "bytes"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Add categories to your posts"
+#: ../../include/text.php:1377 ../../include/text.php:1389
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Ability to file posts under folders"
+#: ../../include/text.php:1551 ../../mod/events.php:335
+msgid "link to source"
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Dislike Posts"
+#: ../../include/text.php:1606
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Ability to dislike posts/comments"
+#: ../../include/text.php:1858 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
+msgid "event"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Star Posts"
+#: ../../include/text.php:1862
+msgid "activity"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/text.php:1864 ../../mod/content.php:628
+#: ../../object/Item.php:364 ../../object/Item.php:377
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:1865
+msgid "post"
 msgstr ""
 
-#: ../../include/dba.php:44
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../include/text.php:2020
+msgid "Item filed"
 msgstr ""
 
 #: ../../include/group.php:25
@@ -2023,7 +2027,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1963
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970
 msgid "Events"
 msgstr ""
 
@@ -2628,14 +2632,14 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1970
+#: ../../mod/notes.php:44 ../../boot.php:1977
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/display.php:19 ../../mod/search.php:89
 #: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
-#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
-#: ../../mod/community.php:18
+#: ../../mod/videos.php:115 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:914 ../../mod/community.php:18
 msgid "Public access denied."
 msgstr ""
 
@@ -5043,6 +5047,26 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
+#: ../../mod/videos.php:125
+msgid "No videos selected"
+msgstr ""
+
+#: ../../mod/videos.php:226 ../../mod/photos.php:1025
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1784
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr ""
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr ""
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr ""
@@ -5993,10 +6017,6 @@ msgstr ""
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:1025
-msgid "Access to this item is restricted."
-msgstr ""
-
 #: ../../mod/photos.php:1088
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
@@ -6137,10 +6157,6 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1784
-msgid "View Album"
-msgstr ""
-
 #: ../../mod/photos.php:1793
 msgid "Recent Photos"
 msgstr ""
@@ -7079,10 +7095,14 @@ msgstr ""
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1966
-msgid "Events and Calendar"
+#: ../../boot.php:1960 ../../boot.php:1963
+msgid "Videos"
 msgstr ""
 
 #: ../../boot.php:1973
+msgid "Events and Calendar"
+msgstr ""
+
+#: ../../boot.php:1980
 msgid "Only You Can See This"
 msgstr ""