upd8 readme

diff --git a/README b/README
index 7c4b7dd65b15727365edc0f3cbca2518c699a56a..951ae05573b6a646867ed43f85843fa384fe687b 100644 (file)
--- a/README
+++ b/README
@@ -3,133 +3,61 @@
     * Friendika *
     *************
 
-    Social Communications Platform
-
-    http://friendika.com
-
-       
-    Since the dawn of the world-wide-web, the internet has been a battleground
-between the "big boys" with all their resources, and a bunch of upstarts whose
-goal is to topple the status quo - and bring the same powers of global reach 
-to anybody with a computer and an internet connection. 
-
-    The latest battleground is social networking. Many of your friends would 
-have you believe that the world (and all the information in it) belongs to 
-Facebook. 
-
-    Friendika is here to rock that boat. 
-
-    Granted, all your friends aren't here - yet. The people who made fun of you
-in high school (yet curiously wanted to be friends with you now) are still
-"poking" each other and managing their virtual farms and telling you all about
-their virtual gang wars. Would you miss them? 
-
-    I wouldn't. 
-
-    You probably have a handful of friends that are truly special. Tell those
-friends that the world has changed - because it has. It's time to move on. A 
-year ago, if you had left Facebook, there was no place to go - at least a 
-place which offered the same kind of social interaction (and wasn't just
-another huge company trying to make money off of all of your private
-information).
-
-    Today you have options.  
-
-    What if there was a social network which provided some of the same
-interaction you've grown to love, *and* was free to use, *and* was open source,
-*and* where your privacy is always under your control?
- 
-    And what if this social network could scale to encompass the entire 
-internet, and *not* require a central organisation - whose core business model 
-is to sell information it can discover about you for profit?
-
-    Look no further. 
-
-    Friendika is a social network without boundaries, and without ownership. 
-Friendika installations can link together into a global social network which 
-is free from central control. Besides the Friendika network (which is privacy 
-enhanced); you can also connect with and communicate with friends on identi.ca,
-Status.Net and many other sites and social networks *today*. 
-
-    Welcome to the federated social web. If you choose not to use Friendika 
-(though we think you'd be foolish not to), you can choose any of 20-30 other
-providers of federated social communications software and still be a part of this
-vast new social network. This is going to be bigger than Facebook. 
-
-    Much bigger.  
-
-    We are currently developing connectors to seamlessly communicate with many 
-other open social networks and providers - like Diaspora, GNU-Social,
-OneSocialWeb, and even some of the larger closed services such as Facebook and
-Twitter.
-
-    Over the coming months, the boundaries between these networks will start
-to become indistinguishable as they all become part of your social circle.
-
-   Our core belief is that your personal thoughts and conversations belong to 
-you - and are only meant to be shared with those you wish to share them with. 
-
-   Period.  
-
-   Friendika is secure, and as private as you wish it to be. Our privacy 
-settings are straight-forward and simple, because we know that relationships 
-rarely are (straight-forward and simple). Whether you're communicating with
-drinking buddies or potential employers, you can rest assured that each is
-only able to see the side of you that you wish to present. If you send a
-private message to your aunt Mary, we will encrypt it with military grade
-encryption.
-
-    Friendika delivers. We've got an incredibly rich social communications 
-interface you can make use of *right now*.
-
-    And lest you think we're just trying to copy Facebook feature-for-feature,
-you couldn't be further from the truth. We like the conversational style
-because it feels natural, and that's why Facebook grew to be what it is today. 
-But we're creating something completely different. 
-
-    Something better.
-
-    Start with richer communications. Adorn your text, colour it. We've got a 
-text counter in case you're sending across to one of the primitive social 
-networks, but we don't think you should have to squeeze your communications
-into some arbitrary limit. Free yourself from thinking how to squeeze your 
-message into 140 or 420 characters, or sending messages in some strange 
-short-hand code. Even edit your text after you send it. It's OK.
-
-    A single instance of Friendika can easily support hundreds of (and up to
-several thousand) people using commodity hosting hardware. You could even run
-Friendika on an old PC in your closet or garage. Each of these people are able
-to connect with potentially hundreds or thousands of friends and associates 
-on any other supported network anywhere in the world and share photos, links,
-status updates, etc. 
-
-    But maybe you don't want to be connected to the world... and that's OK 
-too. Friendika may be closed off from the global community and used to support
-social networking amongst corporate, educational, religious, and other private
-communities. This makes it an excellent choice for the social networking needs
-of young teenagers and especially k-12 organisations. 
-
-    Every person on Friendika has unlimited profiles available to them. There
-is a "public profile" which can be seen by anybody. Additional profiles may be 
-tailored to specific groups or individuals. Try doing that on Twitter.
-
-    Groups may be created and used for closed conversations. In this way your 
-conversations with one group of friends is completely isolated from other 
-friends or groups of friends.
-
-    You may also create interactive band/celebrity pages, special interest
-groups, and even organisational 'soapboxes' - for social communications that
-require the ability to scale to global levels. Friendika provides for automatic
-relationship management in these extreme cases so that you can concentrate on
-your message and public persona - and not worry about being swamped by friend
-requests. You can even maintain private social contact with your closest 
-friends and public updates to your hordes of fans - using the same interface.
-
-    No other social network offers this ability.  
+    Friendika Communications Server
 
+    http://project.friendika.com
+
+
+       Friendika is a web application for managing social communications. Some
+would call it a "social network" or "distributed social network". We think 
+both terms have been over-used and don't really apply - though Friendika can
+also fill those roles.
+
+       At its essence, Friendika is a web application which can monitor various
+information streams, and also let you participate in online conversations with
+friends and associates using a variety of network protocols.
+
+       Friendika also manages your personal profiles and photo albums and lets 
+you tailor either of these to specific audiences. Your communications can be 
+either open and public, or closed and private. You can easily create "groups"
+of contacts with which you can partition your conversations into social
+circles.
+
+       Friendika is decentralised. Any account on any Friendika server can connect
+with any other Friendika account on any other server. You can also connect to
+friends on Status.Net and other federated social web services (e.g. identi.ca,
+GNU-Social, etc.).
+
+       Outgoing communications can be directed at these networks and/or your
+existing accounts on Facebook and Twitter - and even delivered to email 
+contacts.
+
+       Incoming data streams aren't limited to traditional social networks.
+They may include most any service that provide a syndication feed (both RSS
+and Atom). This allows you to view communications from friends in other 
+diverse social networks - such as Diaspora, Google Buzz, and millions of 
+Wordpress blogs, news services, and other websites. Over time we will try to
+build two-way bridges to many of these services so that you can freely
+interact in both directions with anybody who allows it. 
+
+        Communications between supported networks are private and encrypted, 
+using military grade encryption - and require mutual authentication of servers
+before any data is exchanged. 
+
+    Friendika has no boundaries and no central ownership. Anybody with a 
+commodity PHP/MySQL web server can provide a membership hub, and each 
+individual server can then support several thousand participating members 
+- each with their own unique communication and privacy needs.
+
+       If you are creating a website which requires social interaction, Friendika 
+can take the place of blog software, forum software and feed readers, and
+also provide individualised communications and content management - or
+provide a ready alternative to traditional "monolithic" social networks.
 
     Join us.
 
+       Find out more about the project at http://project.friendika.com
+
     *******************
     Friendika Demo Site
     *******************

diff --git a/util/messages.po b/util/messages.po
index f35865d4ea810bc233be9beb01b2e50ba3934527..6433cf86429816d3b06fee97c97404d89f68bdd7 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.947\n"
+"Project-Id-Version: 2.1.948\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-12 21:37-0700\n"
+"POT-Creation-Date: 2011-04-13 20:16-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"
@@ -21,6 +21,101 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
+#: ../../mod/crepair.php:42
+msgid "Contact settings applied."
+msgstr ""
+
+#: ../../mod/crepair.php:44
+msgid "Contact update failed."
+msgstr ""
+
+#: ../../mod/crepair.php:54 ../../mod/photos.php:85 ../../mod/photos.php:777
+#: ../../mod/editpost.php:10 ../../mod/install.php:93
+#: ../../mod/notifications.php:56 ../../mod/contacts.php:106
+#: ../../mod/settings.php:15 ../../mod/settings.php:20
+#: ../../mod/settings.php:211 ../../mod/manage.php:75 ../../mod/network.php:6
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:13
+#: ../../mod/register.php:25 ../../mod/regmod.php:16 ../../mod/item.php:57
+#: ../../mod/item.php:668 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
+#: ../../mod/profile_photo.php:150 ../../mod/message.php:8
+#: ../../mod/message.php:116 ../../mod/wall_upload.php:42
+#: ../../mod/follow.php:8 ../../mod/display.php:133 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110
+#: ../../wip/photos.php:77 ../../wip/photos.php:723 ../../wip/group.php:19
+#: ../../wip/photos-chris.php:97 ../../wip/photos-chris.php:770
+#: ../../index.php:265
+msgid "Permission denied."
+msgstr ""
+
+#: ../../mod/crepair.php:68 ../../mod/contacts.php:214
+#: ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
+msgstr ""
+
+#: ../../mod/crepair.php:74
+msgid "Repair Contact Settings"
+msgstr ""
+
+#: ../../mod/crepair.php:76
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact will stop working."
+msgstr ""
+
+#: ../../mod/crepair.php:77
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr ""
+
+#: ../../mod/crepair.php:85
+msgid "Name"
+msgstr ""
+
+#: ../../mod/crepair.php:86
+msgid "Account Nickname"
+msgstr ""
+
+#: ../../mod/crepair.php:87
+msgid "Account URL"
+msgstr ""
+
+#: ../../mod/crepair.php:88
+msgid "Friend Request URL"
+msgstr ""
+
+#: ../../mod/crepair.php:89
+msgid "Friend Confirm URL"
+msgstr ""
+
+#: ../../mod/crepair.php:90
+msgid "Notification Endpoint URL"
+msgstr ""
+
+#: ../../mod/crepair.php:91
+msgid "Poll/Feed URL"
+msgstr ""
+
+#: ../../mod/crepair.php:100 ../../mod/photos.php:805 ../../mod/photos.php:862
+#: ../../mod/photos.php:1069 ../../mod/photos.php:1112
+#: ../../mod/install.php:133 ../../mod/contacts.php:264
+#: ../../mod/settings.php:364 ../../mod/manage.php:106 ../../mod/group.php:76
+#: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:64
+#: ../../addon/facebook/facebook.php:151
+#: ../../addon/randplace/randplace.php:179
+#: ../../addon/statusnet/statusnet.php:163
+#: ../../addon/statusnet/statusnet.php:189
+#: ../../addon/statusnet/statusnet.php:207 ../../addon/twitter/twitter.php:156
+#: ../../addon/twitter/twitter.php:175 ../../include/conversation.php:317
+#: ../../wip/photos.php:754 ../../wip/photos.php:793 ../../wip/photos.php:954
+#: ../../wip/addon/randplace/randplace.php:178 ../../wip/group.php:99
+#: ../../wip/group.php:176 ../../wip/photos-chris.php:801
+#: ../../wip/photos-chris.php:840 ../../wip/photos-chris.php:1001
+msgid "Submit"
+msgstr ""
+
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 #: ../../mod/dfrn_request.php:630 ../../addon/js_upload/js_upload.php:41
 msgid "Cancel"
@@ -67,34 +162,14 @@ msgstr ""
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:85 ../../mod/photos.php:777 ../../mod/editpost.php:10
-#: ../../mod/install.php:93 ../../mod/notifications.php:56
-#: ../../mod/contacts.php:106 ../../mod/settings.php:15
-#: ../../mod/settings.php:20 ../../mod/settings.php:211
-#: ../../mod/manage.php:75 ../../mod/network.php:6 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:13 ../../mod/register.php:25
-#: ../../mod/regmod.php:16 ../../mod/item.php:57 ../../mod/item.php:668
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133
-#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
-#: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8
-#: ../../mod/display.php:133 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110
-#: ../../wip/photos.php:77 ../../wip/photos.php:723 ../../wip/group.php:19
-#: ../../wip/photos-chris.php:97 ../../wip/photos-chris.php:770
-#: ../../index.php:265
-msgid "Permission denied."
-msgstr ""
-
 #: ../../mod/photos.php:95 ../../wip/photos.php:87
 #: ../../wip/photos-chris.php:107
 msgid "Contact information unavailable"
 msgstr ""
 
 #: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:854
-#: ../../mod/photos.php:869 ../../mod/register.php:285
-#: ../../mod/register.php:292 ../../mod/register.php:299
+#: ../../mod/photos.php:869 ../../mod/register.php:288
+#: ../../mod/register.php:295 ../../mod/register.php:302
 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
 #: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
 #: ../../mod/profile_photo.php:231 ../../mod/profile_photo.php:240
@@ -159,24 +234,6 @@ msgstr ""
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:805 ../../mod/photos.php:862 ../../mod/photos.php:1069
-#: ../../mod/photos.php:1112 ../../mod/install.php:133
-#: ../../mod/contacts.php:264 ../../mod/settings.php:364
-#: ../../mod/manage.php:106 ../../mod/group.php:76 ../../mod/group.php:159
-#: ../../mod/profiles.php:370 ../../mod/invite.php:64
-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
-#: ../../addon/statusnet/statusnet.php:163
-#: ../../addon/statusnet/statusnet.php:189
-#: ../../addon/statusnet/statusnet.php:207 ../../addon/twitter/twitter.php:156
-#: ../../addon/twitter/twitter.php:175 ../../include/conversation.php:317
-#: ../../wip/photos.php:754 ../../wip/photos.php:793 ../../wip/photos.php:954
-#: ../../wip/addon/randplace/randplace.php:178 ../../wip/group.php:99
-#: ../../wip/group.php:176 ../../wip/photos-chris.php:801
-#: ../../wip/photos-chris.php:840 ../../wip/photos-chris.php:1001
-msgid "Submit"
-msgstr ""
-
 #: ../../mod/photos.php:812 ../../wip/photos.php:742
 #: ../../wip/photos-chris.php:789
 msgid "Upload Photos"
@@ -502,7 +559,7 @@ msgid "Introduction received at "
 msgstr ""
 
 #: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
-#: ../../mod/register.php:329 ../../mod/register.php:366
+#: ../../mod/register.php:332 ../../mod/register.php:369
 #: ../../mod/regmod.php:93 ../../mod/item.php:475 ../../mod/item.php:498
 #: ../../mod/dfrn_notify.php:189 ../../mod/dfrn_notify.php:404
 #: ../../mod/dfrn_notify.php:490 ../../mod/dfrn_confirm.php:654
@@ -523,13 +580,13 @@ msgid "Does $name know you?"
 msgstr ""
 
 #: ../../mod/dfrn_request.php:620 ../../mod/settings.php:289
-#: ../../mod/settings.php:301 ../../mod/register.php:436
+#: ../../mod/settings.php:301 ../../mod/register.php:439
 #: ../../mod/profiles.php:355
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/dfrn_request.php:621 ../../mod/settings.php:290
-#: ../../mod/settings.php:302 ../../mod/register.php:437
+#: ../../mod/settings.php:302 ../../mod/register.php:440
 #: ../../mod/profiles.php:356
 msgid "No"
 msgstr ""
@@ -902,19 +959,15 @@ msgstr ""
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
-msgstr ""
-
-#: ../../mod/contacts.php:228 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:362
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:364
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:366
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:368
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:370
 msgid "you are a fan of"
 msgstr ""
 
@@ -992,71 +1045,79 @@ msgid "Ignore contact"
 msgstr ""
 
 #: ../../mod/contacts.php:275
-msgid "Delete contact"
+msgid "Repair contact URL settings"
+msgstr ""
+
+#: ../../mod/contacts.php:276
+msgid "Repair contact URL settings (WARNING: Advanced)"
 msgstr ""
 
 #: ../../mod/contacts.php:277
+msgid "Delete contact"
+msgstr ""
+
+#: ../../mod/contacts.php:279
 msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:280
 msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:282
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:283
+#: ../../mod/contacts.php:285
 msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:283
+#: ../../mod/contacts.php:285
 msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:286
 msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:286
 msgid "Ignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:289
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:288
+#: ../../mod/contacts.php:290
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:319 ../../include/nav.php:118
+#: ../../mod/contacts.php:321 ../../include/nav.php:117
 #: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:323
 msgid "Show Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:323
 msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:323 ../../mod/directory.php:38
+#: ../../mod/contacts.php:325 ../../mod/directory.php:38
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:324 ../../mod/directory.php:40
+#: ../../mod/contacts.php:326 ../../mod/directory.php:40
 msgid "Find"
 msgstr ""
 
-#: ../../mod/contacts.php:384 ../../mod/viewcontacts.php:44
+#: ../../mod/contacts.php:386 ../../mod/viewcontacts.php:44
 msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:385 ../../include/conversation.php:520
+#: ../../mod/contacts.php:387 ../../include/conversation.php:520
 msgid "Edit contact"
 msgstr ""
 
@@ -1335,6 +1396,10 @@ msgstr ""
 msgid "Default Post Permissions"
 msgstr ""
 
+#: ../../mod/settings.php:398
+msgid "(click to open/close)"
+msgstr ""
+
 #: ../../mod/manage.php:37
 #, php-format
 msgid "Welcome back %s"
@@ -1419,7 +1484,7 @@ msgstr ""
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:277 ../../mod/register.php:442
+#: ../../mod/network.php:277 ../../mod/register.php:445
 #: ../../mod/profile.php:300 ../../mod/display.php:142
 msgid ""
 "Shared content is covered by the <a href=\"http://creativecommons.org/"
@@ -1526,115 +1591,115 @@ msgstr ""
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:89
+#: ../../mod/register.php:91
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:92
+#: ../../mod/register.php:95
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:95
+#: ../../mod/register.php:98
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:101
+#: ../../mod/register.php:104
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:109
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:112 ../../mod/register.php:212
+#: ../../mod/register.php:115 ../../mod/register.php:215
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:131
+#: ../../mod/register.php:134
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:198
+#: ../../mod/register.php:201
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:234
+#: ../../mod/register.php:237
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:328 ../../mod/regmod.php:92
+#: ../../mod/register.php:331 ../../mod/regmod.php:92
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:333
+#: ../../mod/register.php:336
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:337
+#: ../../mod/register.php:340
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:342
+#: ../../mod/register.php:345
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:365
+#: ../../mod/register.php:368
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:369
+#: ../../mod/register.php:372
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:417
+#: ../../mod/register.php:420
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:418
+#: ../../mod/register.php:421
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:419
+#: ../../mod/register.php:422
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:433
+#: ../../mod/register.php:436
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:449
+#: ../../mod/register.php:452
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:457
+#: ../../mod/register.php:460
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:458
+#: ../../mod/register.php:461
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:459
+#: ../../mod/register.php:462
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:460
+#: ../../mod/register.php:463
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:463 ../../include/nav.php:62 ../../boot.php:827
+#: ../../mod/register.php:466 ../../include/nav.php:62 ../../boot.php:827
 msgid "Register"
 msgstr ""
 
@@ -1842,7 +1907,7 @@ msgstr ""
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/message.php:125 ../../include/nav.php:107
+#: ../../mod/message.php:125 ../../include/nav.php:106
 msgid "Messages"
 msgstr ""
 
@@ -1966,7 +2031,7 @@ msgstr ""
 msgid "Applications"
 msgstr ""
 
-#: ../../mod/search.php:21 ../../include/nav.php:74 ../../boot.php:2042
+#: ../../mod/search.php:21 ../../include/nav.php:73 ../../boot.php:2042
 msgid "Search"
 msgstr ""
 
@@ -2165,7 +2230,7 @@ msgstr ""
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:456 ../../include/nav.php:116
+#: ../../mod/profiles.php:456 ../../include/nav.php:115
 msgid "Profiles"
 msgstr ""
 
@@ -2921,35 +2986,35 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../../include/nav.php:57 ../../include/nav.php:98
+#: ../../include/nav.php:57 ../../include/nav.php:97
 msgid "Home"
 msgstr ""
 
-#: ../../include/nav.php:68
+#: ../../include/nav.php:67
 msgid "Help"
 msgstr ""
 
-#: ../../include/nav.php:71
+#: ../../include/nav.php:70
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:84
+#: ../../include/nav.php:83
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:94
+#: ../../include/nav.php:93
 msgid "Network"
 msgstr ""
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:102
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:111
+#: ../../include/nav.php:110
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:114
+#: ../../include/nav.php:113
 msgid "Settings"
 msgstr ""
 

diff --git a/util/strings.php b/util/strings.php
index 845d25b76f11e19d3c4943a423c53c423c68825e..42615fb5dbd0c57941d830af01f1d5d3f3c52313 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -134,6 +134,8 @@ $a->strings['Please take a moment to elaborate on this selection if you feel it
 $a->strings['Visit $name\'s profile'] = 'Visit $name\'s profile';
 $a->strings['Block/Unblock contact'] = 'Block/Unblock contact';
 $a->strings['Ignore contact'] = 'Ignore contact';
+$a->strings['Repair contact URL settings'] = 'Repair contact URL settings';
+$a->strings["Repair contact URL settings \x28WARNING: Advanced\x29"] = "Repair contact URL settings \x28WARNING: Advanced\x29";
 $a->strings['Delete contact'] = 'Delete contact';
 $a->strings['Last updated: '] = 'Last updated: ';
 $a->strings['Update public posts: '] = 'Update public posts: ';
@@ -151,6 +153,18 @@ $a->strings['Finding: '] = 'Finding: ';
 $a->strings['Find'] = 'Find';
 $a->strings['Visit $username\'s profile'] = 'Visit $username\'s profile';
 $a->strings['Edit contact'] = 'Edit contact';
+$a->strings['Contact settings applied.'] = 'Contact settings applied.';
+$a->strings['Contact update failed.'] = 'Contact update failed.';
+$a->strings['Repair Contact Settings'] = 'Repair Contact Settings';
+$a->strings['<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact will stop working.'] = '<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact will stop working.';
+$a->strings['Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.'] = 'Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.';
+$a->strings['Name'] = 'Name';
+$a->strings['Account Nickname'] = 'Account Nickname';
+$a->strings['Account URL'] = 'Account URL';
+$a->strings['Friend Request URL'] = 'Friend Request URL';
+$a->strings['Friend Confirm URL'] = 'Friend Confirm URL';
+$a->strings['Notification Endpoint URL'] = 'Notification Endpoint URL';
+$a->strings['Poll/Feed URL'] = 'Poll/Feed URL';
 $a->strings['Profile not found.'] = 'Profile not found.';
 $a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
 $a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: ';
@@ -565,6 +579,7 @@ $a->strings['New Password:'] = 'New Password:';
 $a->strings['Confirm:'] = 'Confirm:';
 $a->strings['Advanced Page Settings'] = 'Advanced Page Settings';
 $a->strings['Default Post Permissions'] = 'Default Post Permissions';
+$a->strings["\x28click to open/close\x29"] = "\x28click to open/close\x29";
 $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
 $a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';