move all message display sub-functions from boot.php into conversation.php

diff --git a/boot.php b/boot.php
index 377f5287f9b68addca8d7c73740149111a1b8b09..9bf331cee5e46ce48d68a6e411db985133b63d15 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1847,38 +1847,6 @@ function allowed_email($email) {
        return $found;
 }}
 
-// Format the like/dislike text for a profile item
-// $cnt = number of people who like/dislike the item
-// $arr = array of pre-linked names of likers/dislikers
-// $type = one of 'like, 'dislike'
-// $id  = item id
-// returns formatted text
-
-if(! function_exists('format_like')) {
-function format_like($cnt,$arr,$type,$id) {
-       $o = '';
-       if($cnt == 1)
-               $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
-       else {
-               $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
-               $o .= (($type === 'like') ? 
-                                       sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
-                                        : 
-                                       sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) ); 
-               $o .= EOL ;
-               $total = count($arr);
-               if($total >= MAX_LIKERS)
-                       $arr = array_slice($arr, 0, MAX_LIKERS - 1);
-               if($total < MAX_LIKERS)
-                       $arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1];
-               $str = implode(', ', $arr);
-               if($total >= MAX_LIKERS)
-                       $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
-               $str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str));
-               $o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
-       }
-       return $o;
-}}
 
 
 // wrapper to load a view template, checking for alternate
@@ -1976,29 +1944,6 @@ return str_replace ("%","=",rawurlencode($s));
 }} 
 
 
-if(! function_exists('like_puller')) {
-function like_puller($a,$item,&$arr,$mode) {
-
-       $url = '';
-       $sparkle = '';
-       $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
-
-       if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
-               $url = $item['author-link'];
-               if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
-                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                       $sparkle = ' class="sparkle" ';
-               }
-               if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
-                       $arr[$item['parent'] . '-l'] = array();
-               if(! isset($arr[$item['parent']]))
-                       $arr[$item['parent']] = 1;
-               else    
-                       $arr[$item['parent']] ++;
-               $arr[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
-       }
-       return;
-}}
 
 if(! function_exists('get_mentions')) {
 function get_mentions($item) {
@@ -2680,106 +2625,6 @@ function unamp($s) {
        return str_replace('&amp;', '&', $s);
 }}
 
-if(! function_exists('extract_item_authors')) {
-function extract_item_authors($arr,$uid) {
-
-       if((! $uid) || (! is_array($arr)) || (! count($arr)))
-               return array();
-       $urls = array();
-       foreach($arr as $rr) {
-               if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
-                       $urls[] = "'" . dbesc($rr['author-link']) . "'";
-       }
-
-       // pre-quoted, don't put quotes on %s
-       if(count($urls)) {
-               $r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
-                       intval($uid),
-                       implode(',',$urls)
-               );
-               if(count($r)) {
-                       $ret = array();
-                       $authors = array();
-                       foreach($r as $rr){
-                               if ($rr['network']=='dfrn')
-                                       $ret[$rr['url']] = $rr['id'];
-                               $authors[$r['url']]= $rr;
-                       }
-                       $a->authors = $authors;
-                       return $ret;
-               }
-       }
-       return array();         
-}}
-
-if(! function_exists('item_photo_menu')){
-function item_photo_menu($item){
-       $a = get_app();
-       
-       if (!isset($a->authors)){
-               $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
-               $authors = array();
-               foreach($rr as $r) $authors[$r['url']]= $r;
-               $a->authors = $authors;
-       }
-       
-       $contact_url="";
-       $pm_url="";
-
-       $status_link="";
-       $photo_link="";
-       $profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
-       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-       // $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
-
-       $profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0); 
-
-       // So we are checking that this is a logged in user on some page that *isn't* a profile page
-       // OR a profile page where the viewer owns the profile. 
-       // Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
-       // or a friend's contact that we both have a connection to. 
-
-       if((local_user() && ($profile_owner == 0)) 
-               || ($profile_owner && $profile_owner == local_user())) {
-
-               if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
-                       $redir = $redirect_url;
-               elseif(isset($a->authors[$item['author-link']])) {
-                       $redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
-                       $cid = $a->authors[$item['author-link']]['id'];
-               }
-
-               if($item['network'] === 'dfrn' && (! $item['self'])) {
-                       $status_link = $redir . "?url=status";
-                       $profile_link = $redir . "?url=profile";
-                       $photos_link = $redir . "?url=photos";
-                       $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
-               }
-
-               $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
-       }
-
-
-       $menu = Array(
-               t("View status") => $status_link,
-               t("View profile") => $profile_link,
-               t("View photos") => $photos_link,               
-               t("Edit contact") => $contact_url,
-               t("Send PM") => $pm_url,
-       );
-       
-       
-       $args = array($item, &$menu);
-       
-       call_hooks('item_photo_menu', $args);
-       
-       $o = "";
-       foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
-       }
-       return $o;
-}}
 
 if(! function_exists('lang_selector')) {
 function lang_selector() {

diff --git a/include/conversation.php b/include/conversation.php
index 839afc4817d02fc79531e584048c6be714a69288..5c8327e56e0b7fe1d778c076ea3cf9b54bd7ec84 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,5 +1,15 @@
 <?php
 
+/**
+ * "Render" a conversation or list of items for HTML display.
+ * There are two major forms of display:
+ *      - Sequential or unthreaded ("New Item View" or search results)
+ *      - conversation view
+ * The $mode parameter decides between the various renderings and also
+ * figures out how to determine page owner and other contextual items 
+ * that are based on unique features of the calling module.
+ *
+ */
 
 function conversation(&$a, $items, $mode, $update) {
 
@@ -417,4 +427,165 @@ function conversation(&$a, $items, $mode, $update) {
                $o .= '</div>';
 
        return $o;
-} 
\ No newline at end of file
+} 
+
+
+
+
+if(! function_exists('extract_item_authors')) {
+function extract_item_authors($arr,$uid) {
+
+       if((! $uid) || (! is_array($arr)) || (! count($arr)))
+               return array();
+       $urls = array();
+       foreach($arr as $rr) {
+               if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
+                       $urls[] = "'" . dbesc($rr['author-link']) . "'";
+       }
+
+       // pre-quoted, don't put quotes on %s
+       if(count($urls)) {
+               $r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
+                       intval($uid),
+                       implode(',',$urls)
+               );
+               if(count($r)) {
+                       $ret = array();
+                       $authors = array();
+                       foreach($r as $rr){
+                               if ($rr['network']=='dfrn')
+                                       $ret[$rr['url']] = $rr['id'];
+                               $authors[$r['url']]= $rr;
+                       }
+                       $a->authors = $authors;
+                       return $ret;
+               }
+       }
+       return array();         
+}}
+
+if(! function_exists('item_photo_menu')){
+function item_photo_menu($item){
+       $a = get_app();
+       
+       if (!isset($a->authors)){
+               $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
+               $authors = array();
+               foreach($rr as $r) $authors[$r['url']]= $r;
+               $a->authors = $authors;
+       }
+       
+       $contact_url="";
+       $pm_url="";
+
+       $status_link="";
+       $photo_link="";
+       $profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
+       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+       // $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
+
+       $profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0); 
+
+       // So we are checking that this is a logged in user on some page that *isn't* a profile page
+       // OR a profile page where the viewer owns the profile. 
+       // Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
+       // or a friend's contact that we both have a connection to. 
+
+       if((local_user() && ($profile_owner == 0)) 
+               || ($profile_owner && $profile_owner == local_user())) {
+
+               if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
+                       $redir = $redirect_url;
+               elseif(isset($a->authors[$item['author-link']])) {
+                       $redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
+                       $cid = $a->authors[$item['author-link']]['id'];
+               }
+
+               if($item['network'] === 'dfrn' && (! $item['self'])) {
+                       $status_link = $redir . "?url=status";
+                       $profile_link = $redir . "?url=profile";
+                       $photos_link = $redir . "?url=photos";
+                       $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+               }
+
+               $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
+       }
+
+
+       $menu = Array(
+               t("View status") => $status_link,
+               t("View profile") => $profile_link,
+               t("View photos") => $photos_link,               
+               t("Edit contact") => $contact_url,
+               t("Send PM") => $pm_url,
+       );
+       
+       
+       $args = array($item, &$menu);
+       
+       call_hooks('item_photo_menu', $args);
+       
+       $o = "";
+       foreach($menu as $k=>$v){
+               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+       }
+       return $o;
+}}
+
+if(! function_exists('like_puller')) {
+function like_puller($a,$item,&$arr,$mode) {
+
+       $url = '';
+       $sparkle = '';
+       $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
+
+       if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
+               $url = $item['author-link'];
+               if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
+                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+                       $sparkle = ' class="sparkle" ';
+               }
+               if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
+                       $arr[$item['parent'] . '-l'] = array();
+               if(! isset($arr[$item['parent']]))
+                       $arr[$item['parent']] = 1;
+               else    
+                       $arr[$item['parent']] ++;
+               $arr[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
+       }
+       return;
+}}
+
+// Format the like/dislike text for a profile item
+// $cnt = number of people who like/dislike the item
+// $arr = array of pre-linked names of likers/dislikers
+// $type = one of 'like, 'dislike'
+// $id  = item id
+// returns formatted text
+
+if(! function_exists('format_like')) {
+function format_like($cnt,$arr,$type,$id) {
+       $o = '';
+       if($cnt == 1)
+               $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
+       else {
+               $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
+               $o .= (($type === 'like') ? 
+                                       sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
+                                        : 
+                                       sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) ); 
+               $o .= EOL ;
+               $total = count($arr);
+               if($total >= MAX_LIKERS)
+                       $arr = array_slice($arr, 0, MAX_LIKERS - 1);
+               if($total < MAX_LIKERS)
+                       $arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1];
+               $str = implode(', ', $arr);
+               if($total >= MAX_LIKERS)
+                       $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
+               $str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str));
+               $o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
+       }
+       return $o;
+}}

diff --git a/mod/display.php b/mod/display.php
index da4566dc4a4c5f549c47e1a56ddbb42638a8d61f..c8496160f5ed7fe026284152bdf71308318b9791 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,6 +3,11 @@
 
 function display_content(&$a) {
 
+       require_once("include/bbcode.php");
+       require_once('include/security.php');
+       require_once('include/conversation.php');
+
+
        $o = '<div id="live-display"></div>' . "\r\n";
 
        $nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -16,8 +21,6 @@ function display_content(&$a) {
                return;
        }
 
-       require_once("include/bbcode.php");
-       require_once('include/security.php');
 
 
        $groups = array();
@@ -113,7 +116,6 @@ function display_content(&$a) {
                        );
                }
 
-               require_once('include/conversation.php');
 
                $o .= conversation($a,$r,'display', false);
 

diff --git a/mod/network.php b/mod/network.php
index 1b5ea5d651d8ffd326ccf2f7565f65258010ad94..35b6a299b209da14002e974bc1cbe155adcbe1a8 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -27,6 +27,8 @@ function network_init(&$a) {
 
 function network_content(&$a, $update = 0) {
 
+       require_once('include/conversation.php');
+
        if(! local_user())
        return login(false);
 
@@ -267,8 +269,6 @@ function network_content(&$a, $update = 0) {
 
        $mode = (($nouveau) ? 'network-new' : 'network');
 
-       require_once('include/conversation.php');
-
        $o .= conversation($a,$r,$mode,$update);
 
        if(! $update) {

diff --git a/mod/photos.php b/mod/photos.php
index 757b4685d91908d9b2825d78b39b13dc86f46cf2..186873a7b899b6ca5ebd1b8809542b3ff735d4c8 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -657,6 +657,10 @@ function photos_content(&$a) {
        // photos/name/image/xxxxx/edit
 
 
+       require_once('include/bbcode.php');
+       require_once('include/security.php');
+       require_once('include/conversation.php');
+
        if(! x($a->data,'user')) {
                notice( t('No photos selected') . EOL );
                return;
@@ -893,8 +897,7 @@ function photos_content(&$a) {
 
        if($datatype === 'image') {
 
-               require_once('security.php');
-               require_once('bbcode.php');
+
 
                $o = '<div id="live-display"></div>' . "\r\n";
                // fetch image, item containing image, then comments

diff --git a/mod/profile.php b/mod/profile.php
index 0a044069a39b8d83b9649e2f6369d532417933d6..923f4fb90de99525abc5d0ab25a357d2eb6f0d8c 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -50,6 +50,7 @@ function profile_content(&$a, $update = 0) {
 
        require_once("include/bbcode.php");
        require_once('include/security.php');
+       require_once('include/conversation.php');
 
        $groups = array();
 
@@ -289,7 +290,6 @@ function profile_content(&$a, $update = 0) {
                $o .= get_birthdays();
 
 
-       require_once('include/conversation.php');
 
        $o .= conversation($a,$r,'profile',$update);
 

diff --git a/mod/search.php b/mod/search.php
index 23b2ddb7e3884a0445595ab6a34379df2c285845..793a8c2bb282e9f26a14f9689abd3ea3caead314 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -9,6 +9,10 @@ function search_post(&$a) {
 
 function search_content(&$a) {
 
+       require_once("include/bbcode.php");
+       require_once('include/security.php');
+       require_once('include/conversation.php');
+
        if(x($_SESSION,'theme'))
                unset($_SESSION['theme']);
 
@@ -26,8 +30,6 @@ function search_content(&$a) {
        if(! $search)
                return $o;
 
-       require_once("include/bbcode.php");
-       require_once('include/security.php');
 
        $sql_extra = "
                AND `item`.`allow_cid` = '' 
@@ -81,7 +83,6 @@ function search_content(&$a) {
        );
 
 
-       require_once('include/conversation.php');
 
        $o .= conversation($a,$r,'search',false);
 

diff --git a/util/messages.po b/util/messages.po
index 23f250da2075fad65caa235ac4cbfcf7ebef5b25..60987b722e711c1cf9b912ea68dcffcb040bab8f 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,943 +6,1191 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.942\n"
+"Project-Id-Version: 2.1.947\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 12:29+0200\n"
+"POT-Creation-Date: 2011-04-12 15:47-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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../index.php:208
-msgid "Not Found"
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
 msgstr ""
 
-#: ../../index.php:209
-msgid "Page not found."
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:630 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
 msgstr ""
 
-#: ../../index.php:264 ../../mod/group.php:88
-msgid "Permission denied"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../index.php:265 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
-#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
-#: ../../mod/settings.php:15 ../../mod/settings.php:20
-#: ../../mod/settings.php:211 ../../mod/photos.php:85 ../../mod/photos.php:773
-#: ../../mod/display.php:311 ../../mod/editpost.php:10 ../../mod/invite.php:13
-#: ../../mod/invite.php:50 ../../mod/contacts.php:106
-#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
-#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:668
-#: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
-#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
-msgid "Permission denied."
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../boot.php:359
-msgid "Delete this item?"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../boot.php:360 ../../mod/profile.php:387 ../../mod/photos.php:1108
-#: ../../mod/display.php:173 ../../mod/network.php:505
-msgid "Comment"
+#: ../../mod/tagrm.php:93
+msgid "Remove"
 msgstr ""
 
-#: ../../boot.php:813
-msgid "Create a New Account"
+#: ../../mod/dfrn_poll.php:79 ../../mod/dfrn_poll.php:504
+#, php-format
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../boot.php:814 ../../mod/register.php:463 ../../include/nav.php:62
-msgid "Register"
+#: ../../mod/photos.php:30 ../../wip/photos.php:31
+#: ../../wip/photos-chris.php:41
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../boot.php:820
-msgid "Nickname or Email address: "
+#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
+#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1235
+#: ../../mod/photos.php:1246 ../../include/Photo.php:225
+#: ../../include/Photo.php:232 ../../include/Photo.php:239
+#: ../../include/items.php:1026 ../../include/items.php:1029
+#: ../../include/items.php:1032 ../../wip/photos.php:35
+#: ../../wip/photos.php:98 ../../wip/photos.php:731 ../../wip/photos.php:785
+#: ../../wip/photos.php:800 ../../wip/photos.php:1111
+#: ../../wip/photos.php:1122 ../../wip/photos-chris.php:45
+#: ../../wip/photos-chris.php:118 ../../wip/photos-chris.php:778
+#: ../../wip/photos-chris.php:832 ../../wip/photos-chris.php:847
+#: ../../wip/photos-chris.php:1158 ../../wip/photos-chris.php:1169
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../boot.php:821
-msgid "Password: "
+#: ../../mod/photos.php:85 ../../mod/photos.php:773 ../../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:131 ../../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 ""
 
-#: ../../boot.php:822 ../../boot.php:828 ../../include/nav.php:45
-msgid "Login"
+#: ../../mod/photos.php:95 ../../wip/photos.php:87
+#: ../../wip/photos-chris.php:107
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../boot.php:826
-msgid "Nickname/Email/OpenID: "
+#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
+#: ../../mod/photos.php:865 ../../mod/register.php:285
+#: ../../mod/register.php:292 ../../mod/register.php:299
+#: ../../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
+#: ../../wip/photos.php:98 ../../wip/photos.php:493 ../../wip/photos.php:785
+#: ../../wip/photos.php:800 ../../wip/photos-chris.php:118
+#: ../../wip/photos-chris.php:525 ../../wip/photos-chris.php:832
+#: ../../wip/photos-chris.php:847
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../boot.php:827
-msgid "Password (if not OpenID): "
+#: ../../mod/photos.php:116 ../../wip/photos.php:108
+#: ../../wip/photos-chris.php:128
+msgid "Album not found."
 msgstr ""
 
-#: ../../boot.php:830
-msgid "Forgot your password?"
+#: ../../mod/photos.php:134 ../../mod/photos.php:859 ../../wip/photos.php:126
+#: ../../wip/photos.php:794 ../../wip/photos-chris.php:146
+#: ../../wip/photos-chris.php:841
+msgid "Delete Album"
 msgstr ""
 
-#: ../../boot.php:831 ../../mod/lostpass.php:74
-msgid "Password Reset"
+#: ../../mod/photos.php:197 ../../mod/photos.php:1067 ../../wip/photos.php:192
+#: ../../wip/photos.php:955 ../../wip/photos-chris.php:212
+#: ../../wip/photos-chris.php:1002
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../boot.php:842 ../../include/nav.php:39
-msgid "Logout"
+#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
+msgid "was tagged in a"
 msgstr ""
 
-#: ../../boot.php:1083
-msgid "prev"
+#: ../../mod/photos.php:469 ../../mod/like.php:110 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
+msgid "photo"
 msgstr ""
 
-#: ../../boot.php:1085
-msgid "first"
+#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
+msgid "by"
 msgstr ""
 
-#: ../../boot.php:1114
-msgid "last"
+#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
+#: ../../wip/photos.php:511 ../../wip/photos-chris.php:555
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../boot.php:1117
-msgid "next"
+#: ../../mod/photos.php:571 ../../mod/profile_photo.php:118
+#: ../../mod/wall_upload.php:65 ../../wip/photos.php:520
+#: ../../wip/photos-chris.php:567
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../boot.php:1848
-#, php-format
-msgid "%s likes this."
+#: ../../mod/photos.php:589 ../../mod/profile_photo.php:236
+#: ../../mod/wall_upload.php:82 ../../wip/photos.php:537
+#: ../../wip/photos-chris.php:585
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../boot.php:1848
-#, php-format
-msgid "%s doesn't like this."
+#: ../../mod/photos.php:661 ../../wip/photos.php:611
+#: ../../wip/photos-chris.php:658
+msgid "No photos selected"
 msgstr ""
 
-#: ../../boot.php:1852
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
+#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
+#: ../../mod/photos.php:1109 ../../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:307
+#: ../../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 ""
 
-#: ../../boot.php:1854
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
+#: ../../mod/photos.php:808 ../../wip/photos.php:742
+#: ../../wip/photos-chris.php:789
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../boot.php:1860
-msgid "and"
+#: ../../mod/photos.php:811 ../../mod/photos.php:854 ../../wip/photos.php:745
+#: ../../wip/photos.php:789 ../../wip/photos-chris.php:792
+#: ../../wip/photos-chris.php:836
+msgid "New album name: "
 msgstr ""
 
-#: ../../boot.php:1863
-#, php-format
-msgid ", and %d other people"
+#: ../../mod/photos.php:812 ../../wip/photos.php:746
+#: ../../wip/photos-chris.php:793
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../boot.php:1864
-#, php-format
-msgid "%s like this."
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062 ../../wip/photos.php:749
+#: ../../wip/photos-chris.php:796
+msgid "Permissions"
 msgstr ""
 
-#: ../../boot.php:1864
-#, php-format
-msgid "%s don't like this."
+#: ../../mod/photos.php:869 ../../wip/photos.php:804
+#: ../../wip/photos-chris.php:851
+msgid "Edit Album"
 msgstr ""
 
-#: ../../boot.php:2025
-msgid "No contacts"
+#: ../../mod/photos.php:879 ../../mod/photos.php:1264 ../../wip/photos.php:814
+#: ../../wip/photos.php:1141 ../../wip/photos-chris.php:861
+#: ../../wip/photos-chris.php:1188
+msgid "View Photo"
 msgstr ""
 
-#: ../../boot.php:2033
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../boot.php:2049 ../../mod/viewcontacts.php:17
-msgid "View Contacts"
+#: ../../mod/photos.php:909 ../../wip/photos.php:843
+#: ../../wip/photos-chris.php:890
+msgid "Photo not available"
 msgstr ""
 
-#: ../../boot.php:2066 ../../mod/search.php:17 ../../include/nav.php:68
-msgid "Search"
+#: ../../mod/photos.php:956 ../../wip/photos.php:864
+#: ../../wip/photos-chris.php:911
+msgid "Edit photo"
 msgstr ""
 
-#: ../../boot.php:2221 ../../mod/profile.php:8
-msgid "No profile"
+#: ../../mod/photos.php:958
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../boot.php:2278
-msgid "Connect"
+#: ../../mod/photos.php:962 ../../include/conversation.php:240
+msgid "Private Message"
 msgstr ""
 
-#: ../../boot.php:2288
-msgid "Location:"
+#: ../../mod/photos.php:969
+msgid "<< Prev"
 msgstr ""
 
-#: ../../boot.php:2292
-msgid ", "
+#: ../../mod/photos.php:973 ../../wip/photos.php:870
+#: ../../wip/photos-chris.php:917
+msgid "View Full Size"
 msgstr ""
 
-#: ../../boot.php:2300 ../../include/profile_advanced.php:23
-msgid "Gender:"
+#: ../../mod/photos.php:977
+msgid "Next >>"
 msgstr ""
 
-#: ../../boot.php:2304
-msgid "Status:"
+#: ../../mod/photos.php:1036 ../../wip/photos.php:928
+#: ../../wip/photos-chris.php:975
+msgid "Tags: "
 msgstr ""
 
-#: ../../boot.php:2306 ../../include/profile_advanced.php:103
-msgid "Homepage:"
+#: ../../mod/photos.php:1046 ../../wip/photos.php:938
+#: ../../wip/photos-chris.php:985
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Monday"
+#: ../../mod/photos.php:1055
+msgid "New album name"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Tuesday"
+#: ../../mod/photos.php:1058 ../../wip/photos.php:948
+#: ../../wip/photos-chris.php:995
+msgid "Caption"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Wednesday"
+#: ../../mod/photos.php:1060 ../../wip/photos.php:950
+#: ../../wip/photos-chris.php:997
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Thursday"
+#: ../../mod/photos.php:1064 ../../wip/photos.php:952
+#: ../../wip/photos-chris.php:999
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Friday"
+#: ../../mod/photos.php:1084 ../../include/conversation.php:288
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Saturday"
+#: ../../mod/photos.php:1085 ../../include/conversation.php:289
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../boot.php:2397
-msgid "Sunday"
+#: ../../mod/photos.php:1086 ../../mod/network.php:103
+#: ../../mod/profile.php:158 ../../include/conversation.php:290
+msgid "Share"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "January"
+#: ../../mod/photos.php:1087 ../../mod/editpost.php:70
+#: ../../mod/network.php:112 ../../mod/message.php:190
+#: ../../mod/message.php:324 ../../mod/profile.php:167
+#: ../../include/conversation.php:291
+msgid "Please wait"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "February"
+#: ../../mod/photos.php:1106 ../../mod/photos.php:1148
+#: ../../mod/photos.php:1177 ../../include/conversation.php:304
+#: ../../wip/photos.php:986 ../../wip/photos.php:1025
+#: ../../wip/photos.php:1053 ../../wip/photos-chris.php:1033
+#: ../../wip/photos-chris.php:1072 ../../wip/photos-chris.php:1100
+msgid "This is you"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "March"
+#: ../../mod/photos.php:1108 ../../include/conversation.php:306
+#: ../../boot.php:373
+msgid "Comment"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "April"
+#: ../../mod/photos.php:1205 ../../mod/group.php:146
+#: ../../include/conversation.php:107 ../../include/conversation.php:317
+#: ../../wip/group.php:162
+msgid "Delete"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "May"
+#: ../../mod/photos.php:1251 ../../wip/photos.php:1127
+#: ../../wip/photos-chris.php:1174
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "June"
+#: ../../mod/photos.php:1255 ../../wip/photos.php:1131
+#: ../../wip/photos-chris.php:1178
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "July"
+#: ../../mod/photos.php:1268 ../../wip/photos.php:1147
+#: ../../wip/photos-chris.php:1194
+msgid "View Album"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "August"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "September"
+#: ../../mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "October"
+#: ../../mod/editpost.php:62 ../../include/conversation.php:315
+msgid "Edit"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "November"
+#: ../../mod/editpost.php:63 ../../mod/network.php:104
+#: ../../mod/message.php:188 ../../mod/message.php:322
+#: ../../mod/profile.php:159
+msgid "Upload photo"
 msgstr ""
 
-#: ../../boot.php:2401
-msgid "December"
+#: ../../mod/editpost.php:64 ../../mod/network.php:105
+#: ../../mod/message.php:189 ../../mod/message.php:323
+#: ../../mod/profile.php:160
+msgid "Insert web link"
 msgstr ""
 
-#: ../../boot.php:2416
-msgid "g A l F d"
+#: ../../mod/editpost.php:65 ../../mod/network.php:106
+#: ../../mod/profile.php:161
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../boot.php:2433
-msgid "Birthday Reminders"
+#: ../../mod/editpost.php:66 ../../mod/network.php:107
+#: ../../mod/profile.php:162
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../boot.php:2434
-msgid "Birthdays this week:"
+#: ../../mod/editpost.php:67 ../../mod/network.php:108
+#: ../../mod/profile.php:163
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../boot.php:2435
-msgid "(Adjusted for local time)"
+#: ../../mod/editpost.php:68 ../../mod/network.php:109
+#: ../../mod/profile.php:164
+msgid "Set your location"
 msgstr ""
 
-#: ../../boot.php:2446
-msgid "[today]"
+#: ../../mod/editpost.php:69 ../../mod/network.php:110
+#: ../../mod/profile.php:165
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../boot.php:2643
-msgid "link to source"
+#: ../../mod/editpost.php:71 ../../mod/network.php:113
+#: ../../mod/profile.php:168
+msgid "Permission settings"
 msgstr ""
 
-#: ../../boot.php:2729
-msgid "View status"
+#: ../../mod/editpost.php:77 ../../mod/network.php:119
+#: ../../mod/profile.php:175
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../boot.php:2730
-msgid "View profile"
+#: ../../mod/editpost.php:79 ../../mod/network.php:121
+#: ../../mod/profile.php:177
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../boot.php:2731
-msgid "View photos"
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../boot.php:2732 ../../mod/contacts.php:385
-msgid "Edit contact"
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../boot.php:2733
-msgid "Send PM"
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
-msgstr ""
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+#: ../../mod/dfrn_request.php:164
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/dfrn_request.php:188
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/manage.php:106 ../../mod/profile.php:388
-#: ../../mod/profiles.php:370 ../../mod/settings.php:364
-#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
-#: ../../mod/photos.php:1109 ../../mod/display.php:174 ../../mod/invite.php:64
-#: ../../mod/contacts.php:264 ../../mod/install.php:133
-#: ../../mod/network.php:506 ../../mod/group.php:97 ../../mod/group.php:155
-#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
-#: ../../addon/statusnet/statusnet.php:163
-#: ../../addon/statusnet/statusnet.php:189
-#: ../../addon/statusnet/statusnet.php:207
-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
-msgid "Submit"
+#: ../../mod/dfrn_request.php:216
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
+#: ../../mod/dfrn_request.php:241
 #, php-format
-msgid "Image exceeds size limit of %d"
-msgstr ""
-
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:571
-msgid "Unable to process image."
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/item.php:212
-#: ../../mod/message.php:93
-msgid "Wall Photos"
+#: ../../mod/dfrn_request.php:242
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:236
-#: ../../mod/photos.php:589
-msgid "Image upload failed."
+#: ../../mod/dfrn_request.php:243
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:392
-#: ../../mod/dfrn_notify.php:478 ../../mod/regmod.php:93
-#: ../../mod/register.php:329 ../../mod/register.php:366
-#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
-#: ../../mod/item.php:475 ../../mod/item.php:498
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1420
-msgid "Administrator"
+#: ../../mod/dfrn_request.php:273
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:179
-msgid "noreply"
+#: ../../mod/dfrn_request.php:292
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:237
-msgid "New mail received at "
+#: ../../mod/dfrn_request.php:305
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477
+#: ../../mod/dfrn_request.php:309
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/profile.php:102
-msgid "Status"
+#: ../../mod/dfrn_request.php:330
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7
-msgid "Profile"
+#: ../../mod/dfrn_request.php:336
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/profile.php:104
-msgid "Photos"
+#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/profile.php:130 ../../mod/network.php:77
-#: ../../mod/message.php:172
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/profile.php:131 ../../mod/network.php:78
-msgid "Please enter a YouTube link:"
+#: ../../mod/dfrn_request.php:423
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/profile.php:132 ../../mod/network.php:79
-msgid "Please enter a video(.ogg) link/URL:"
+#: ../../mod/dfrn_request.php:477
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/profile.php:133 ../../mod/network.php:80
-msgid "Please enter an audio(.ogg) link/URL:"
+#: ../../mod/dfrn_request.php:491
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/profile.php:134 ../../mod/network.php:81
-msgid "Where are you right now?"
+#: ../../mod/dfrn_request.php:503
+#, php-format
+msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/profile.php:135 ../../mod/network.php:82
-msgid "Enter a title for this item"
+#: ../../mod/dfrn_request.php:504
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/profile.php:158 ../../mod/profile.php:372
-#: ../../mod/photos.php:1086 ../../mod/display.php:158
-#: ../../mod/network.php:105 ../../mod/network.php:489
-msgid "Share"
+#: ../../mod/dfrn_request.php:505
+msgid "Confirm"
 msgstr ""
 
-#: ../../mod/profile.php:159 ../../mod/editpost.php:63
-#: ../../mod/network.php:106 ../../mod/message.php:188
-#: ../../mod/message.php:322
-msgid "Upload photo"
+#: ../../mod/dfrn_request.php:538 ../../include/items.php:1409
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/profile.php:160 ../../mod/editpost.php:64
-#: ../../mod/network.php:107 ../../mod/message.php:189
-#: ../../mod/message.php:323
-msgid "Insert web link"
+#: ../../mod/dfrn_request.php:545
+msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/profile.php:161 ../../mod/editpost.php:65
-#: ../../mod/network.php:108
-msgid "Insert YouTube video"
+#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
+#: ../../mod/register.php:329 ../../mod/register.php:366
+#: ../../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
+#: ../../include/items.php:1418
+msgid "Administrator"
 msgstr ""
 
-#: ../../mod/profile.php:162 ../../mod/editpost.php:66
-#: ../../mod/network.php:109
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/dfrn_request.php:617
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/profile.php:163 ../../mod/editpost.php:67
-#: ../../mod/network.php:110
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/dfrn_request.php:618
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/profile.php:164 ../../mod/editpost.php:68
-#: ../../mod/network.php:111
-msgid "Set your location"
+#: ../../mod/dfrn_request.php:619
+msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/profile.php:165 ../../mod/editpost.php:69
-#: ../../mod/network.php:112
-msgid "Clear browser location"
+#: ../../mod/dfrn_request.php:620 ../../mod/settings.php:289
+#: ../../mod/settings.php:301 ../../mod/register.php:436
+#: ../../mod/profiles.php:355
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/profile.php:166 ../../mod/network.php:113
-msgid "Set title"
+#: ../../mod/dfrn_request.php:621 ../../mod/settings.php:290
+#: ../../mod/settings.php:302 ../../mod/register.php:437
+#: ../../mod/profiles.php:356
+msgid "No"
 msgstr ""
 
-#: ../../mod/profile.php:167 ../../mod/profile.php:373
-#: ../../mod/photos.php:1087 ../../mod/display.php:159
-#: ../../mod/editpost.php:70 ../../mod/network.php:114
-#: ../../mod/network.php:490 ../../mod/message.php:190
-#: ../../mod/message.php:324
-msgid "Please wait"
+#: ../../mod/dfrn_request.php:622
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/profile.php:168 ../../mod/editpost.php:71
-#: ../../mod/network.php:115
-msgid "Permission settings"
+#: ../../mod/dfrn_request.php:623
+msgid ""
+"Please enter your profile address from one of the following supported social "
+"networks:"
 msgstr ""
 
-#: ../../mod/profile.php:175 ../../mod/editpost.php:77
-#: ../../mod/network.php:121
-msgid "CC: email addresses"
+#: ../../mod/dfrn_request.php:624
+msgid "Friendika"
 msgstr ""
 
-#: ../../mod/profile.php:177 ../../mod/editpost.php:79
-#: ../../mod/network.php:123
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/dfrn_request.php:625
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/profile.php:352 ../../mod/network.php:428
-#, php-format
-msgid "See all %d comments"
+#: ../../mod/dfrn_request.php:626
+msgid "Private (secure) network"
 msgstr ""
 
-#: ../../mod/profile.php:363 ../../mod/photos.php:962
-#: ../../mod/display.php:149 ../../mod/network.php:443
-msgid "Private Message"
+#: ../../mod/dfrn_request.php:627
+msgid "Public (insecure) network"
 msgstr ""
 
-#: ../../mod/profile.php:370 ../../mod/photos.php:1084
-#: ../../mod/display.php:156 ../../mod/network.php:487
-msgid "I like this (toggle)"
+#: ../../mod/dfrn_request.php:628
+msgid "Your profile address:"
 msgstr ""
 
-#: ../../mod/profile.php:371 ../../mod/photos.php:1085
-#: ../../mod/display.php:157 ../../mod/network.php:488
-msgid "I don't like this (toggle)"
+#: ../../mod/dfrn_request.php:629
+msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/profile.php:385 ../../mod/photos.php:1106
-#: ../../mod/photos.php:1148 ../../mod/photos.php:1177
-#: ../../mod/display.php:171 ../../mod/network.php:503
-msgid "This is you"
+#: ../../mod/install.php:33
+msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../mod/profile.php:411 ../../mod/display.php:224
-#: ../../mod/editpost.php:62 ../../mod/network.php:513
-msgid "Edit"
+#: ../../mod/install.php:38
+msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/profile.php:433 ../../mod/photos.php:1205
-#: ../../mod/display.php:240 ../../mod/network.php:514 ../../mod/group.php:141
-msgid "Delete"
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/profile.php:455 ../../mod/search.php:124
-#: ../../mod/display.php:264 ../../mod/network.php:330
-#: ../../mod/network.php:563
-msgid "View $name's profile"
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
 msgstr ""
 
-#: ../../mod/profile.php:489 ../../mod/display.php:320
-#: ../../mod/register.php:442 ../../mod/network.php:609
+#: ../../mod/install.php:75
 msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/follow.php:186
-msgid "The profile address specified does not provide adequate information."
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/follow.php:192
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/follow.php:243
-msgid "Unable to retrieve contact information."
+#: ../../mod/install.php:84
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/follow.php:289
-msgid "following"
+#: ../../mod/install.php:85
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/install.php:98
+msgid "Welcome to Friendika."
 msgstr ""
 
-#: ../../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
-#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
-#: ../../mod/photos.php:865 ../../mod/register.php:285
-#: ../../mod/register.php:292 ../../mod/register.php:299
-msgid "Profile Photos"
+#: ../../mod/install.php:121
+msgid "Friendika Social Network"
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:243
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: ../../mod/install.php:122
+msgid "Installation"
 msgstr ""
 
-#: ../../mod/profile_photo.php:95
-msgid "Unable to process image"
+#: ../../mod/install.php:123
+msgid ""
+"In order to install Friendika we need to know how to contact your database."
 msgstr ""
 
-#: ../../mod/profile_photo.php:188
-msgid "Upload File:"
+#: ../../mod/install.php:124
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/profile_photo.php:189
-msgid "Upload Profile Photo"
+#: ../../mod/install.php:125
+msgid ""
+"The database you specify below must already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:190
-msgid "Upload"
+#: ../../mod/install.php:126
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/profile_photo.php:191 ../../mod/settings.php:336
-msgid "or"
+#: ../../mod/install.php:127
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/profile_photo.php:191
-msgid "select a photo from your photo albums"
+#: ../../mod/install.php:128
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/profile_photo.php:204
-msgid "Crop Image"
+#: ../../mod/install.php:129
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/profile_photo.php:205
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/install.php:130
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
-msgid "Done Editing"
+#: ../../mod/install.php:148
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/profile_photo.php:234
-msgid "Image uploaded successfully."
+#: ../../mod/install.php:149
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
 msgstr ""
 
-#: ../../mod/home.php:23
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/install.php:156
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/regmod.php:10
-msgid "Please login."
+#: ../../mod/install.php:157
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/regmod.php:54
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/install.php:179
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/regmod.php:92 ../../mod/register.php:328
-#, php-format
-msgid "Registration details for %s"
+#: ../../mod/install.php:180
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/regmod.php:96
-msgid "Account approved."
+#: ../../mod/install.php:189
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
-#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/install.php:191
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/install.php:193
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:199
-msgid "Profile updated."
+#: ../../mod/install.php:195
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:254
-msgid "Profile deleted."
+#: ../../mod/install.php:197
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
-msgid "Profile-"
+#: ../../mod/install.php:208
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
-msgid "New profile created."
+#: ../../mod/install.php:209
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/profiles.php:307
-msgid "Profile unavailable to clone."
+#: ../../mod/install.php:210
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
 msgstr ""
 
-#: ../../mod/profiles.php:354
-msgid "Hide my contact/friend list from viewers of this profile?"
+#: ../../mod/install.php:211
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:355 ../../mod/settings.php:289
-#: ../../mod/settings.php:301 ../../mod/register.php:436
-#: ../../mod/dfrn_request.php:620
-msgid "Yes"
+#: ../../mod/install.php:220
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/profiles.php:356 ../../mod/settings.php:290
-#: ../../mod/settings.php:302 ../../mod/register.php:437
-#: ../../mod/dfrn_request.php:621
-msgid "No"
+#: ../../mod/install.php:235
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/profiles.php:369
-msgid "Edit Profile Details"
+#: ../../mod/match.php:10
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/profiles.php:371
-msgid "View this profile"
+#: ../../mod/match.php:50
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/profiles.php:372
-msgid "Create a new profile using these settings"
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/profiles.php:373
-msgid "Clone this profile"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/profiles.php:374
-msgid "Delete this profile"
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/profiles.php:375
-msgid "Profile Name:"
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/profiles.php:376
-msgid "Your Full Name:"
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/profiles.php:377
-msgid "Title/Description:"
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/profiles.php:378
-msgid "Your Gender:"
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
 msgstr ""
 
-#: ../../mod/profiles.php:379
-msgid "Birthday (y/m/d):"
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/profiles.php:380
-msgid "Street Address:"
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/profiles.php:381
-msgid "Locality/City:"
+#: ../../mod/notifications.php:104
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/profiles.php:382
-msgid "Postal/Zip Code:"
+#: ../../mod/notifications.php:104
+msgid "yes"
 msgstr ""
 
-#: ../../mod/profiles.php:383
-msgid "Country:"
+#: ../../mod/notifications.php:104
+msgid "no"
 msgstr ""
 
-#: ../../mod/profiles.php:384
-msgid "Region/State:"
+#: ../../mod/notifications.php:110
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/profiles.php:385
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: ../../mod/notifications.php:111
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/profiles.php:386
-msgid "Who: (if applicable)"
+#: ../../mod/notifications.php:112
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/profiles.php:387
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/notifications.php:119
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90
-msgid "Sexual Preference:"
+#: ../../mod/notifications.php:120
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/profiles.php:389
-msgid "Homepage URL:"
+#: ../../mod/notifications.php:120
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115
-msgid "Political Views:"
+#: ../../mod/notifications.php:130 ../../mod/notifications.php:153
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/profiles.php:391
-msgid "Religious Views:"
+#: ../../mod/notifications.php:139
+msgid "No notifications."
 msgstr ""
 
-#: ../../mod/profiles.php:392
-msgid "Public Keywords:"
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/profiles.php:393
-msgid "Private Keywords:"
+#: ../../mod/notifications.php:154
+msgid "Deny"
 msgstr ""
 
-#: ../../mod/profiles.php:394
-msgid "Example: fishing photography software"
+#: ../../mod/notifications.php:159
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/profiles.php:395
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../mod/profiles.php:396
-msgid "(Used for searching profiles, never shown to others)"
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:397
-msgid "Tell us about yourself..."
+#: ../../mod/contacts.php:19
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../mod/profiles.php:398
-msgid "Hobbies/Interests"
+#: ../../mod/contacts.php:20
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../mod/profiles.php:399
-msgid "Contact information and Social Networks"
+#: ../../mod/contacts.php:21
+msgid "Follow"
 msgstr ""
 
-#: ../../mod/profiles.php:400
-msgid "Musical interests"
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/profiles.php:401
-msgid "Books, literature"
+#: ../../mod/contacts.php:57
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/profiles.php:402
-msgid "Television"
+#: ../../mod/contacts.php:88
+msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/profiles.php:403
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/contacts.php:146
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/profiles.php:404
-msgid "Love/romance"
+#: ../../mod/contacts.php:146
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/profiles.php:405
-msgid "Work/employment"
+#: ../../mod/contacts.php:160
+msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/profiles.php:406
-msgid "School/education"
+#: ../../mod/contacts.php:160
+msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/profiles.php:411
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: ../../mod/contacts.php:181
+msgid "stopped following"
 msgstr ""
 
-#: ../../mod/profiles.php:421 ../../mod/directory.php:91
-msgid "Age: "
+#: ../../mod/contacts.php:200
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/profiles.php:456 ../../include/nav.php:110
-msgid "Profiles"
+#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/profiles.php:457
-msgid "Change profile photo"
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:360
+msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/profiles.php:458
-msgid "Create New Profile"
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:364
+msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/profiles.php:470
-msgid "Profile Image"
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:368
+msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/settings.php:38
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/contacts.php:252
+msgid "Privacy Unavailable"
 msgstr ""
 
-#: ../../mod/settings.php:43
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/contacts.php:253
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/settings.php:54
-msgid "Password changed."
+#: ../../mod/contacts.php:256
+msgid "Never"
 msgstr ""
 
-#: ../../mod/settings.php:56
-msgid "Password update failed. Please try again."
+#: ../../mod/contacts.php:260
+msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/settings.php:98
-msgid " Please use a shorter name."
+#: ../../mod/contacts.php:260
+msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/settings.php:100
-msgid " Name too short."
+#: ../../mod/contacts.php:263
+msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/settings.php:106
-msgid " Not valid email."
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/settings.php:108
-msgid " Cannot change to that email."
+#: ../../mod/contacts.php:266
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/settings.php:166
-msgid "Settings updated."
+#: ../../mod/contacts.php:267
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/settings.php:216 ../../mod/settings.php:356
-msgid "Plugin Settings"
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
 msgstr ""
 
-#: ../../mod/settings.php:217 ../../mod/settings.php:355
-msgid "Account Settings"
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
 msgstr ""
 
-#: ../../mod/settings.php:223
-msgid "No Plugin settings configured"
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> to guide them."
 msgstr ""
 
-#: ../../mod/settings.php:262
-msgid "Normal Account"
+#: ../../mod/contacts.php:271
+msgid ""
+"Please take a moment to elaborate on this selection if you feel it could be "
+"helpful to others."
 msgstr ""
 
-#: ../../mod/settings.php:263
-msgid "This account is a normal personal profile"
+#: ../../mod/contacts.php:272
+msgid "Visit $name's profile"
 msgstr ""
 
-#: ../../mod/settings.php:264
-msgid "Soapbox Account"
+#: ../../mod/contacts.php:273
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/settings.php:265
-msgid "Automatically approve all connection/friend requests as read-only fans"
+#: ../../mod/contacts.php:274
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/settings.php:266
-msgid "Community/Celebrity Account"
+#: ../../mod/contacts.php:275
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/settings.php:267
-msgid "Automatically approve all connection/friend requests as read-write fans"
+#: ../../mod/contacts.php:277
+msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/settings.php:268
+#: ../../mod/contacts.php:278
+msgid "Update public posts: "
+msgstr ""
+
+#: ../../mod/contacts.php:280
+msgid "Update now"
+msgstr ""
+
+#: ../../mod/contacts.php:283
+msgid "Unblock this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:283
+msgid "Block this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:284
+msgid "Unignore this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:284
+msgid "Ignore this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:287
+msgid "Currently blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:288
+msgid "Currently ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:319 ../../include/nav.php:118
+#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
+msgid "Contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:321
+msgid "Show Blocked Connections"
+msgstr ""
+
+#: ../../mod/contacts.php:321
+msgid "Hide Blocked Connections"
+msgstr ""
+
+#: ../../mod/contacts.php:323 ../../mod/directory.php:38
+msgid "Finding: "
+msgstr ""
+
+#: ../../mod/contacts.php:324 ../../mod/directory.php:40
+msgid "Find"
+msgstr ""
+
+#: ../../mod/contacts.php:384 ../../mod/viewcontacts.php:44
+msgid "Visit $username's profile"
+msgstr ""
+
+#: ../../mod/contacts.php:385 ../../boot.php:2768
+msgid "Edit contact"
+msgstr ""
+
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:56
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../mod/lostpass.php:74 ../../boot.php:844
+msgid "Password Reset"
+msgstr ""
+
+#: ../../mod/lostpass.php:75
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../mod/lostpass.php:76
+msgid "Your new password is"
+msgstr ""
+
+#: ../../mod/lostpass.php:77
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../mod/lostpass.php:78
+msgid "click here to login"
+msgstr ""
+
+#: ../../mod/lostpass.php:79
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../mod/lostpass.php:107
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../mod/lostpass.php:108
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../mod/lostpass.php:109
+msgid "Nickname or Email: "
+msgstr ""
+
+#: ../../mod/lostpass.php:110
+msgid "Reset"
+msgstr ""
+
+#: ../../mod/settings.php:38
+msgid "Passwords do not match. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:43
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:54
+msgid "Password changed."
+msgstr ""
+
+#: ../../mod/settings.php:56
+msgid "Password update failed. Please try again."
+msgstr ""
+
+#: ../../mod/settings.php:98
+msgid " Please use a shorter name."
+msgstr ""
+
+#: ../../mod/settings.php:100
+msgid " Name too short."
+msgstr ""
+
+#: ../../mod/settings.php:106
+msgid " Not valid email."
+msgstr ""
+
+#: ../../mod/settings.php:108
+msgid " Cannot change to that email."
+msgstr ""
+
+#: ../../mod/settings.php:166
+msgid "Settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:216 ../../mod/settings.php:356
+msgid "Plugin Settings"
+msgstr ""
+
+#: ../../mod/settings.php:217 ../../mod/settings.php:355
+msgid "Account Settings"
+msgstr ""
+
+#: ../../mod/settings.php:223
+msgid "No Plugin settings configured"
+msgstr ""
+
+#: ../../mod/settings.php:262
+msgid "Normal Account"
+msgstr ""
+
+#: ../../mod/settings.php:263
+msgid "This account is a normal personal profile"
+msgstr ""
+
+#: ../../mod/settings.php:264
+msgid "Soapbox Account"
+msgstr ""
+
+#: ../../mod/settings.php:265
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr ""
+
+#: ../../mod/settings.php:266
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: ../../mod/settings.php:267
+msgid "Automatically approve all connection/friend requests as read-write fans"
+msgstr ""
+
+#: ../../mod/settings.php:268
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -970,6 +1218,10 @@ msgstr ""
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
+#: ../../mod/settings.php:336 ../../mod/profile_photo.php:191
+msgid "or"
+msgstr ""
+
 #: ../../mod/settings.php:341
 msgid "Your profile address is"
 msgstr ""
@@ -1082,1308 +1334,892 @@ msgstr ""
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/search.php:62
-msgid "No results."
+#: ../../mod/manage.php:37
+#, php-format
+msgid "Welcome back %s"
 msgstr ""
 
-#: ../../mod/search.php:140 ../../mod/network.php:346
-msgid "View in context"
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/photos.php:30
-msgid "Photo Albums"
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
 msgstr ""
 
-#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
-#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1235
-#: ../../mod/photos.php:1246 ../../include/Photo.php:225
-#: ../../include/Photo.php:232 ../../include/Photo.php:239
-#: ../../include/items.php:1028 ../../include/items.php:1031
-#: ../../include/items.php:1034
-msgid "Contact Photos"
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/photos.php:95
-msgid "Contact information unavailable"
+#: ../../mod/network.php:18
+msgid "Normal View"
 msgstr ""
 
-#: ../../mod/photos.php:116
-msgid "Album not found."
+#: ../../mod/network.php:20
+msgid "New Item View"
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:859
-msgid "Delete Album"
-msgstr ""
+#: ../../mod/network.php:57
+#, php-format
+msgid "%d member"
+msgid_plural "%d members"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1067
-msgid "Delete Photo"
+#: ../../mod/network.php:58
+#, php-format
+msgid "Warning: This group contains %s from an insecure network."
 msgstr ""
 
-#: ../../mod/photos.php:469
-msgid "was tagged in a"
+#: ../../mod/network.php:59
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../mod/like.php:110
-msgid "photo"
+#: ../../mod/network.php:75 ../../mod/message.php:172
+#: ../../mod/profile.php:130
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/photos.php:469
-msgid "by"
+#: ../../mod/network.php:76 ../../mod/profile.php:131
+msgid "Please enter a YouTube link:"
 msgstr ""
 
-#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
-msgid "Image exceeds size limit of "
+#: ../../mod/network.php:77 ../../mod/profile.php:132
+msgid "Please enter a video(.ogg) link/URL:"
 msgstr ""
 
-#: ../../mod/photos.php:661
-msgid "No photos selected"
+#: ../../mod/network.php:78 ../../mod/profile.php:133
+msgid "Please enter an audio(.ogg) link/URL:"
 msgstr ""
 
-#: ../../mod/photos.php:808
-msgid "Upload Photos"
+#: ../../mod/network.php:79 ../../mod/profile.php:134
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../mod/photos.php:811 ../../mod/photos.php:854
-msgid "New album name: "
+#: ../../mod/network.php:80 ../../mod/profile.php:135
+msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../mod/photos.php:812
-msgid "or existing album name: "
+#: ../../mod/network.php:111 ../../mod/profile.php:166
+msgid "Set title"
 msgstr ""
 
-#: ../../mod/photos.php:814 ../../mod/photos.php:1062
-msgid "Permissions"
+#: ../../mod/network.php:164
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/photos.php:869
-msgid "Edit Album"
+#: ../../mod/network.php:175
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/photos.php:879 ../../mod/photos.php:1265
-msgid "View Photo"
+#: ../../mod/network.php:179
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/photos.php:909
-msgid "Photo not available"
+#: ../../mod/network.php:277 ../../mod/register.php:442
+#: ../../mod/profile.php:300 ../../mod/display.php:140
+msgid ""
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
-#: ../../mod/photos.php:956
-msgid "Edit photo"
+#: ../../mod/group.php:27 ../../wip/group.php:29
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/photos.php:958
-msgid "Use as profile photo"
+#: ../../mod/group.php:33 ../../wip/group.php:35
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/photos.php:969
-msgid "<< Prev"
+#: ../../mod/group.php:43 ../../mod/group.php:115 ../../wip/group.php:45
+#: ../../wip/group.php:137
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/photos.php:973
-msgid "View Full Size"
+#: ../../mod/group.php:56 ../../wip/group.php:58
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/photos.php:977
-msgid "Next >>"
+#: ../../mod/group.php:67 ../../wip/group.php:90 ../../index.php:264
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/photos.php:1036
-msgid "Tags: "
+#: ../../mod/group.php:74 ../../wip/group.php:97
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/photos.php:1046
-msgid "[Remove any tag]"
+#: ../../mod/group.php:75 ../../mod/group.php:158 ../../wip/group.php:98
+#: ../../wip/group.php:174
+msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/photos.php:1055
-msgid "New album name"
+#: ../../mod/group.php:90 ../../wip/group.php:113
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/photos.php:1058
-msgid "Caption"
+#: ../../mod/group.php:92 ../../wip/group.php:115
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/photos.php:1060
-msgid "Add a Tag"
+#: ../../mod/group.php:156
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/photos.php:1064
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/group.php:157 ../../wip/group.php:173
+msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/photos.php:1251
-msgid "Recent Photos"
+#: ../../mod/group.php:169
+msgid "Members"
 msgstr ""
 
-#: ../../mod/photos.php:1255
-msgid "Upload New Photos"
+#: ../../mod/group.php:183
+msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/photos.php:1271
-msgid "View Album"
+#: ../../mod/viewcontacts.php:17 ../../boot.php:2051
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/display.php:15 ../../mod/display.php:315 ../../mod/item.php:598
-msgid "Item not found."
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/display.php:265 ../../mod/network.php:564
-msgid "View $owner_name's profile"
+#: ../../mod/register.php:47
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/display.php:266 ../../mod/network.php:565
-msgid "to"
+#: ../../mod/register.php:62
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/display.php:267 ../../mod/network.php:566
-msgid "Wall-to-Wall"
+#: ../../mod/register.php:74
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/display.php:268 ../../mod/network.php:567
-msgid "via Wall-To-Wall:"
+#: ../../mod/register.php:76
+msgid "Name too short."
 msgstr ""
 
-#: ../../mod/display.php:308
-msgid "Item has been removed."
+#: ../../mod/register.php:89
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
+#: ../../mod/register.php:92
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
+#: ../../mod/register.php:95
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/invite.php:28
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/register.php:101
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/invite.php:32
-#, php-format
-msgid "Please join my network on %s"
+#: ../../mod/register.php:106
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../mod/invite.php:38
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/register.php:112 ../../mod/register.php:212
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/invite.php:42
+#: ../../mod/register.php:131
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr ""
+
+#: ../../mod/register.php:198
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+
+#: ../../mod/register.php:234
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+
+#: ../../mod/register.php:328 ../../mod/regmod.php:92
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Registration details for %s"
+msgstr ""
 
-#: ../../mod/invite.php:57
-msgid "Send invitations"
+#: ../../mod/register.php:333
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/invite.php:58
-msgid "Enter email addresses, one per line:"
+#: ../../mod/register.php:337
+msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/invite.php:59 ../../mod/message.php:185 ../../mod/message.php:319
-msgid "Your message:"
+#: ../../mod/register.php:342
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/invite.php:60
+#: ../../mod/register.php:365
 #, php-format
-msgid "Please join my social network on %s"
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/invite.php:61
-msgid "To accept this invitation, please visit:"
+#: ../../mod/register.php:369
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/invite.php:62
+#: ../../mod/register.php:417
 msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/contacts.php:12
-msgid "Invite Friends"
+#: ../../mod/register.php:418
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/contacts.php:15
-msgid "Find People With Shared Interests"
+#: ../../mod/register.php:419
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/contacts.php:19
-msgid "Connect/Follow"
+#: ../../mod/register.php:433
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/contacts.php:20
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../mod/register.php:449
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/contacts.php:21
-msgid "Follow"
+#: ../../mod/register.php:457
+msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
-msgid "Could not access contact record."
+#: ../../mod/register.php:458
+msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/contacts.php:57
-msgid "Could not locate selected profile."
+#: ../../mod/register.php:459
+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/contacts.php:88
-msgid "Contact updated."
+#: ../../mod/register.php:460
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
-msgid "Failed to update contact record."
+#: ../../mod/register.php:463 ../../include/nav.php:62 ../../boot.php:827
+msgid "Register"
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been blocked"
+#: ../../mod/like.php:110
+msgid "status"
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been unblocked"
+#: ../../mod/like.php:127
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/contacts.php:160
-msgid "Contact has been ignored"
+#: ../../mod/like.php:129
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/contacts.php:160
-msgid "Contact has been unignored"
+#: ../../mod/friendika.php:12 ../../wip/friendika.php:12
+msgid "This is Friendika version"
 msgstr ""
 
-#: ../../mod/contacts.php:181
-msgid "stopped following"
+#: ../../mod/friendika.php:13 ../../wip/friendika.php:13
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/contacts.php:200
-msgid "Contact has been removed."
+#: ../../mod/friendika.php:15
+msgid ""
+"Shared content within the Friendika network is provided under the <a href="
+"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
+"3.0 license</a>"
 msgstr ""
 
-#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
+#: ../../mod/friendika.php:17
+msgid ""
+"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
+"a> to learn more about the Friendika project."
 msgstr ""
 
-#: ../../mod/contacts.php:228 ../../mod/contacts.php:360
-msgid "Mutual Friendship"
+#: ../../mod/friendika.php:19 ../../wip/friendika.php:15
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:364
-msgid "is a fan of yours"
+#: ../../mod/friendika.php:20 ../../wip/friendika.php:16
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
+"dot com"
 msgstr ""
 
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:368
-msgid "you are a fan of"
+#: ../../mod/friendika.php:25
+msgid "Installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/contacts.php:252
-msgid "Privacy Unavailable"
+#: ../../mod/friendika.php:33
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/contacts.php:253
-msgid "Private communications are not available for this contact."
+#: ../../mod/regmod.php:10
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/contacts.php:256
-msgid "Never"
+#: ../../mod/regmod.php:54
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "(Update was successful)"
+#: ../../mod/regmod.php:96
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "(Update was not successful)"
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/contacts.php:263
-msgid "Contact Editor"
+#: ../../mod/item.php:126
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/contacts.php:265
-msgid "Profile Visibility"
+#: ../../mod/item.php:212 ../../mod/message.php:93
+#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:95
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:266
+#: ../../mod/item.php:474
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "Contact Information / Notes"
+#: ../../mod/item.php:497
+#, php-format
+msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/contacts.php:268
-msgid "Online Reputation"
+#: ../../mod/item.php:523
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/contacts.php:269
+#: ../../mod/item.php:541
+#, php-format
 msgid ""
-"Occasionally your friends may wish to inquire about this person's online "
-"legitimacy."
+"This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/contacts.php:270
-msgid ""
-"You may help them choose whether or not to interact with this person by "
-"providing a <em>reputation</em> to guide them."
+#: ../../mod/item.php:543
+msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/item.php:545
 msgid ""
-"Please take a moment to elaborate on this selection if you feel it could be "
-"helpful to others."
-msgstr ""
-
-#: ../../mod/contacts.php:272
-msgid "Visit $name's profile"
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/contacts.php:273
-msgid "Block/Unblock contact"
+#: ../../mod/item.php:547
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/contacts.php:274
-msgid "Ignore contact"
+#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:135
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/contacts.php:275
-msgid "Delete contact"
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/contacts.php:277
-msgid "Last updated: "
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:243
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/contacts.php:278
-msgid "Update public posts: "
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/contacts.php:280
-msgid "Update now"
+#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/contacts.php:283
-msgid "Unblock this contact"
+#: ../../mod/profile_photo.php:188
+msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/contacts.php:283
-msgid "Block this contact"
+#: ../../mod/profile_photo.php:189
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/contacts.php:284
-msgid "Unignore this contact"
+#: ../../mod/profile_photo.php:190
+msgid "Upload"
 msgstr ""
 
-#: ../../mod/contacts.php:284
-msgid "Ignore this contact"
+#: ../../mod/profile_photo.php:191
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/contacts.php:287
-msgid "Currently blocked"
+#: ../../mod/profile_photo.php:204
+msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/contacts.php:288
-msgid "Currently ignored"
+#: ../../mod/profile_photo.php:205
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/contacts.php:319 ../../include/acl_selectors.php:140
-#: ../../include/acl_selectors.php:155 ../../include/nav.php:112
-msgid "Contacts"
+#: ../../mod/profile_photo.php:206
+msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/contacts.php:321
-msgid "Show Blocked Connections"
+#: ../../mod/profile_photo.php:234
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/contacts.php:321
-msgid "Hide Blocked Connections"
+#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/contacts.php:323 ../../mod/directory.php:38
-msgid "Finding: "
+#: ../../mod/removeme.php:43
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: ../../mod/contacts.php:324 ../../mod/directory.php:40
-msgid "Find"
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/contacts.php:384 ../../mod/viewcontacts.php:44
-msgid "Visit $username's profile"
+#: ../../mod/message.php:18
+msgid "No recipient selected."
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/message.php:34
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/register.php:47
-msgid "Invalid OpenID url"
+#: ../../mod/message.php:102
+msgid "Message sent."
 msgstr ""
 
-#: ../../mod/register.php:62
-msgid "Please enter the required information."
+#: ../../mod/message.php:105
+msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/register.php:74
-msgid "Please use a shorter name."
+#: ../../mod/message.php:125 ../../include/nav.php:107
+msgid "Messages"
 msgstr ""
 
-#: ../../mod/register.php:76
-msgid "Name too short."
+#: ../../mod/message.php:126
+msgid "Inbox"
 msgstr ""
 
-#: ../../mod/register.php:89
-msgid "That doesn't appear to be your full (First Last) name."
+#: ../../mod/message.php:127
+msgid "Outbox"
 msgstr ""
 
-#: ../../mod/register.php:92
-msgid "Your email domain is not among those allowed on this site."
+#: ../../mod/message.php:128
+msgid "New Message"
 msgstr ""
 
-#: ../../mod/register.php:95
-msgid "Not a valid email address."
+#: ../../mod/message.php:142
+msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/register.php:101
-msgid "Cannot use that email."
+#: ../../mod/message.php:158
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/register.php:106
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+#: ../../mod/message.php:180
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/register.php:112 ../../mod/register.php:212
-msgid "Nickname is already registered. Please choose another."
+#: ../../mod/message.php:181 ../../mod/message.php:315
+msgid "To:"
 msgstr ""
 
-#: ../../mod/register.php:131
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../mod/message.php:182 ../../mod/message.php:316
+msgid "Subject:"
 msgstr ""
 
-#: ../../mod/register.php:198
-msgid "An error occurred during registration. Please try again."
+#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:59
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/register.php:234
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../mod/message.php:224
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/register.php:333
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: ../../mod/message.php:237
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/register.php:337
-msgid "Failed to send email message. Here is the message that failed."
+#: ../../mod/message.php:240
+msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/register.php:342
-msgid "Your registration can not be processed."
+#: ../../mod/message.php:267
+msgid "Message not available."
 msgstr ""
 
-#: ../../mod/register.php:365
-#, php-format
-msgid "Registration request at %s"
+#: ../../mod/message.php:304
+msgid "Delete message"
 msgstr ""
 
-#: ../../mod/register.php:369
-msgid "Your registration is pending approval by the site owner."
+#: ../../mod/message.php:314
+msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/register.php:417
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+#: ../../mod/profile.php:8 ../../boot.php:2252
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/register.php:418
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: ../../mod/profile.php:102
+msgid "Status"
 msgstr ""
 
-#: ../../mod/register.php:419
-msgid "Your OpenID (optional): "
+#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/register.php:433
-msgid "Include your profile in member directory?"
+#: ../../mod/profile.php:104
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/register.php:449
-msgid "Registration"
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
 msgstr ""
 
-#: ../../mod/register.php:457
-msgid "Your Full Name (e.g. Joe Smith): "
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
 msgstr ""
 
-#: ../../mod/register.php:458
-msgid "Your Email Address: "
+#: ../../mod/follow.php:186
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/register.php:459
+#: ../../mod/follow.php:192
 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>'."
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/register.php:460
-msgid "Choose a nickname: "
+#: ../../mod/follow.php:247
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
+#: ../../mod/follow.php:293
+msgid "following"
 msgstr ""
 
-#: ../../mod/install.php:33
-msgid "Could not create/connect to database."
+#: ../../mod/display.php:128
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/install.php:38
-msgid "Connected to database."
+#: ../../mod/dfrn_notify.php:191
+msgid "noreply"
 msgstr ""
 
-#: ../../mod/install.php:72
-msgid "Proceed with Installation"
+#: ../../mod/dfrn_notify.php:249
+msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/install.php:74
-msgid "Your Friendika site database has been installed."
+#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:489
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/install.php:75
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/apps.php:6
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/search.php:17 ../../include/nav.php:74 ../../boot.php:2097
+msgid "Search"
 msgstr ""
 
-#: ../../mod/install.php:78
-msgid "Proceed to registration"
+#: ../../mod/search.php:62
+msgid "No results."
 msgstr ""
 
-#: ../../mod/install.php:84
-msgid "Database import failed."
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/install.php:85
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/install.php:98
-msgid "Welcome to Friendika."
+#: ../../mod/profiles.php:199
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/install.php:121
-msgid "Friendika Social Network"
+#: ../../mod/profiles.php:254
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/install.php:122
-msgid "Installation"
-msgstr ""
-
-#: ../../mod/install.php:123
-msgid ""
-"In order to install Friendika we need to know how to contact your database."
-msgstr ""
-
-#: ../../mod/install.php:124
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../mod/install.php:125
-msgid ""
-"The database you specify below must already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../mod/install.php:126
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../mod/install.php:127
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../mod/install.php:128
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../mod/install.php:129
-msgid "Database Name"
-msgstr ""
-
-#: ../../mod/install.php:130
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../mod/install.php:148
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../mod/install.php:149
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
-msgstr ""
-
-#: ../../mod/install.php:156
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../mod/install.php:157
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../mod/install.php:179
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../mod/install.php:180
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../mod/install.php:189
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:191
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:193
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:195
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:197
-msgid "Error: mysqli PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:208
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../mod/install.php:209
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../mod/install.php:210
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
-msgstr ""
-
-#: ../../mod/install.php:211
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../mod/install.php:220
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../mod/install.php:235
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../mod/network.php:18
-msgid "Normal View"
-msgstr ""
-
-#: ../../mod/network.php:20
-msgid "New Item View"
-msgstr ""
-
-#: ../../mod/network.php:59
-#, php-format
-msgid "%d member"
-msgid_plural "%d members"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/network.php:60
-#, php-format
-msgid "Warning: This group contains %s from an insecure network."
-msgstr ""
-
-#: ../../mod/network.php:61
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr ""
-
-#: ../../mod/network.php:166
-msgid "No such group"
-msgstr ""
-
-#: ../../mod/network.php:177
-msgid "Group is empty"
-msgstr ""
-
-#: ../../mod/network.php:181
-msgid "Group: "
-msgstr ""
-
-#: ../../mod/network.php:409
-msgid "See more posts like this"
-msgstr ""
-
-#: ../../mod/notifications.php:28
-msgid "Invalid request identifier."
-msgstr ""
-
-#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
-msgid "Discard"
-msgstr ""
-
-#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
-msgid "Ignore"
-msgstr ""
-
-#: ../../mod/notifications.php:68
-msgid "Pending Friend/Connect Notifications"
-msgstr ""
-
-#: ../../mod/notifications.php:72
-msgid "Show Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:72
-msgid "Hide Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:104
-msgid "Claims to be known to you: "
-msgstr ""
-
-#: ../../mod/notifications.php:104
-msgid "yes"
-msgstr ""
-
-#: ../../mod/notifications.php:104
-msgid "no"
-msgstr ""
-
-#: ../../mod/notifications.php:110
-msgid "Approve as: "
-msgstr ""
-
-#: ../../mod/notifications.php:111
-msgid "Friend"
-msgstr ""
-
-#: ../../mod/notifications.php:112
-msgid "Fan/Admirer"
-msgstr ""
-
-#: ../../mod/notifications.php:119
-msgid "Notification type: "
-msgstr ""
-
-#: ../../mod/notifications.php:120
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: ../../mod/notifications.php:120
-msgid "New Follower"
-msgstr ""
-
-#: ../../mod/notifications.php:130 ../../mod/notifications.php:153
-msgid "Approve"
-msgstr ""
-
-#: ../../mod/notifications.php:139
-msgid "No notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:143
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: ../../mod/notifications.php:154
-msgid "Deny"
-msgstr ""
-
-#: ../../mod/notifications.php:159
-msgid "No registrations."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
-msgid "Warning: profile location has no profile photo."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
-#, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/dfrn_request.php:164
-msgid "Introduction complete."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:188
-msgid "Unrecoverable protocol error."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:216
-msgid "Profile unavailable."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:241
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:242
-msgid "Spam protection measures have been invoked."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:243
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:273
-msgid "Invalid locator"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:292
-msgid "Unable to resolve your name at the provided location."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:305
-msgid "You have already introduced yourself here."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:309
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:330
-msgid "Invalid profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:336
-msgid "Disallowed profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:423
-msgid "Your introduction has been sent."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:477
-msgid "Please login to confirm introduction."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:491
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:503
-#, php-format
-msgid "Welcome home %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:504
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:505
-msgid "Confirm"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:538 ../../include/items.php:1411
-msgid "[Name Withheld]"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:545
-msgid "Introduction received at "
-msgstr ""
-
-#: ../../mod/dfrn_request.php:617
-msgid "Friend/Connection Request"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:618
-msgid "Please answer the following:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:619
-msgid "Does $name know you?"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:622
-msgid "Add a personal note:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:623
-msgid ""
-"Please enter your profile address from one of the following supported social "
-"networks:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:624
-msgid "Friendika"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:625
-msgid "StatusNet/Federated Social Web"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:626
-msgid "Private (secure) network"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:627
-msgid "Public (insecure) network"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:628
-msgid "Your profile address:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:629
-msgid "Submit Request"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:630 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
-msgid "Cancel"
-msgstr ""
-
-#: ../../mod/like.php:110
-msgid "status"
-msgstr ""
-
-#: ../../mod/like.php:127
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/like.php:129
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/lostpass.php:27
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../mod/lostpass.php:38
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/lostpass.php:56
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/lostpass.php:75
-msgid "Your password has been reset as requested."
+#: ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/lostpass.php:76
-msgid "Your new password is"
+#: ../../mod/profiles.php:354
+msgid "Hide my contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/lostpass.php:77
-msgid "Save or copy your new password - and then"
+#: ../../mod/profiles.php:369
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/lostpass.php:78
-msgid "click here to login"
+#: ../../mod/profiles.php:371
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/lostpass.php:79
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+#: ../../mod/profiles.php:372
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/lostpass.php:107
-msgid "Forgot your Password?"
+#: ../../mod/profiles.php:373
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/lostpass.php:108
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/profiles.php:374
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/lostpass.php:109
-msgid "Nickname or Email: "
+#: ../../mod/profiles.php:375
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/lostpass.php:110
-msgid "Reset"
+#: ../../mod/profiles.php:376
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/profiles.php:377
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/profiles.php:378
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../mod/profiles.php:379
+msgid "Birthday (y/m/d):"
 msgstr ""
 
-#: ../../mod/apps.php:6
-msgid "Applications"
+#: ../../mod/profiles.php:380
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/directory.php:32
-msgid "Global Directory"
+#: ../../mod/profiles.php:381
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/directory.php:39
-msgid "Site Directory"
+#: ../../mod/profiles.php:382
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/directory.php:94
-msgid "Gender: "
+#: ../../mod/profiles.php:383
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/directory.php:120
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/profiles.php:384
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/friendika.php:12
-msgid "This is Friendika version"
+#: ../../mod/profiles.php:385
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/friendika.php:13
-msgid "running at web location"
+#: ../../mod/profiles.php:386
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/friendika.php:15
-msgid ""
-"Shared content within the Friendika network is provided under the <a href="
-"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
-"3.0 license</a>"
+#: ../../mod/profiles.php:387
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/friendika.php:17
-msgid ""
-"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
-"a> to learn more about the Friendika project."
+#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/friendika.php:19
-msgid "Bug reports and issues: please visit"
+#: ../../mod/profiles.php:389
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/friendika.php:20
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
-"dot com"
+#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115
+msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/friendika.php:25
-msgid "Installed plugins/addons/apps"
+#: ../../mod/profiles.php:391
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/friendika.php:33
-msgid "No installed plugins/addons/apps"
+#: ../../mod/profiles.php:392
+msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/item.php:37
-msgid "Unable to locate original post."
+#: ../../mod/profiles.php:393
+msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/item.php:126
-msgid "Empty post discarded."
+#: ../../mod/profiles.php:394
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/item.php:474
-#, php-format
-msgid "%s commented on your item at %s"
+#: ../../mod/profiles.php:395
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/item.php:497
-#, php-format
-msgid "%s posted on your profile wall at %s"
+#: ../../mod/profiles.php:396
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/item.php:523
-msgid "System error. Post not saved."
+#: ../../mod/profiles.php:397
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/item.php:541
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendika social network."
+#: ../../mod/profiles.php:398
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/item.php:543
-msgid "You may visit them online at"
+#: ../../mod/profiles.php:399
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/item.php:545
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+#: ../../mod/profiles.php:400
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/item.php:547
-#, php-format
-msgid "%s posted an update."
+#: ../../mod/profiles.php:401
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../mod/profiles.php:402
+msgid "Television"
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../mod/profiles.php:403
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../mod/profiles.php:404
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/tagrm.php:93
-msgid "Remove"
+#: ../../mod/profiles.php:405
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/message.php:18
-msgid "No recipient selected."
+#: ../../mod/profiles.php:406
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/message.php:23
-msgid "[no subject]"
+#: ../../mod/profiles.php:411
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/message.php:34
-msgid "Unable to locate contact information."
+#: ../../mod/profiles.php:421 ../../mod/directory.php:91
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/message.php:102
-msgid "Message sent."
+#: ../../mod/profiles.php:456 ../../include/nav.php:116
+msgid "Profiles"
 msgstr ""
 
-#: ../../mod/message.php:105
-msgid "Message could not be sent."
+#: ../../mod/profiles.php:457
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/message.php:125 ../../include/nav.php:101
-msgid "Messages"
+#: ../../mod/profiles.php:458
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/message.php:126
-msgid "Inbox"
+#: ../../mod/profiles.php:470
+msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/message.php:127
-msgid "Outbox"
+#: ../../mod/directory.php:32
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/message.php:128
-msgid "New Message"
+#: ../../mod/directory.php:39
+msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/message.php:142
-msgid "Message deleted."
+#: ../../mod/directory.php:94
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/message.php:158
-msgid "Conversation removed."
+#: ../../mod/directory.php:120
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/message.php:180
-msgid "Send Private Message"
+#: ../../mod/invite.php:28
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/message.php:181 ../../mod/message.php:315
-msgid "To:"
+#: ../../mod/invite.php:32
+#, php-format
+msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../mod/message.php:182 ../../mod/message.php:316
-msgid "Subject:"
+#: ../../mod/invite.php:38
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/message.php:224
-msgid "No messages."
-msgstr ""
+#: ../../mod/invite.php:42
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/message.php:237
-msgid "Delete conversation"
+#: ../../mod/invite.php:57
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/message.php:240
-msgid "D, d M Y - g:i A"
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/message.php:267
-msgid "Message not available."
+#: ../../mod/invite.php:60
+#, php-format
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/message.php:304
-msgid "Delete message"
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/message.php:314
-msgid "Send Reply"
+#: ../../mod/invite.php:62
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:231
@@ -2419,159 +2255,187 @@ msgstr ""
 msgid "is now friends with"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:494
+#: ../../mod/dfrn_confirm.php:499
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:504
+#: ../../mod/dfrn_confirm.php:509
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:515
+#: ../../mod/dfrn_confirm.php:520
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:527
+#: ../../mod/dfrn_confirm.php:532
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:555
+#: ../../mod/dfrn_confirm.php:560
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:566
+#: ../../mod/dfrn_confirm.php:571
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
+#: ../../mod/dfrn_confirm.php:624
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:648
+#: ../../mod/dfrn_confirm.php:653
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
-#: ../../include/auth.php:130 ../../include/auth.php:183
-msgid "Login failed."
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
 msgstr ""
 
-#: ../../mod/openid.php:73 ../../include/auth.php:194
-msgid "Welcome back "
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:483
-#, php-format
-msgid "%s welcomes %s"
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:32
-msgid "No contacts."
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:127
-msgid "Group not found."
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../mod/group.php:79
-msgid "Membership list updated."
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
 msgstr ""
 
-#: ../../mod/group.php:95
-msgid "Create a group of contacts/friends."
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
 msgstr ""
 
-#: ../../mod/group.php:96 ../../mod/group.php:153
-msgid "Group Name: "
+#: ../../addon/tictac/tictac.php:14
+msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: ../../mod/group.php:111
-msgid "Group removed."
+#: ../../addon/tictac/tictac.php:47
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../mod/group.php:113
-msgid "Unable to remove group."
+#: ../../addon/tictac/tictac.php:52
+msgid "New game"
 msgstr ""
 
-#: ../../mod/group.php:152
-msgid "Group Editor"
+#: ../../addon/tictac/tictac.php:53
+msgid "New game with handicap"
 msgstr ""
 
-#: ../../mod/group.php:154
-msgid "Members:"
+#: ../../addon/tictac/tictac.php:54
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: ../../mod/match.php:10
-msgid "Profile Match"
+#: ../../addon/tictac/tictac.php:55
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: ../../mod/match.php:50
-msgid "No matches"
+#: ../../addon/tictac/tictac.php:57
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:64
-msgid "Post to Twitter"
+#: ../../addon/tictac/tictac.php:176
+msgid "You go first..."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:122
-msgid "Twitter Posting Settings"
+#: ../../addon/tictac/tictac.php:181
+msgid "I'm going first this time..."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:129
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../addon/tictac/tictac.php:187
+msgid "You won!"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:148
-msgid ""
-"At this Friendika instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
+msgid "\"Cat\" game!"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:149
-msgid "Log in with Twitter"
+#: ../../addon/tictac/tictac.php:216
+msgid "I won!"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:151
-msgid "Copy the PIN from Twitter here"
+#: ../../addon/randplace/randplace.php:171
+#: ../../wip/addon/randplace/randplace.php:170
+msgid "Randplace Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197
-msgid "Currently connected to: "
+#: ../../addon/randplace/randplace.php:173
+#: ../../wip/addon/randplace/randplace.php:172
+msgid "Enable Randplace Plugin"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:166
+#: ../../addon/java_upload/java_upload.php:33 ../../wip/photos.php:747
+#: ../../wip/photos-chris.php:794
+msgid "Select files to upload: "
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:35 ../../wip/photos.php:752
+#: ../../wip/photos-chris.php:799
 msgid ""
-"If enabled all your <strong>public</strong> postings will be posted to the "
-"associated Twitter account as well."
+"Use the following controls only if the Java uploader [above] fails to launch."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
-msgid "Send public postings to Twitter"
+#: ../../addon/js_upload/js_upload.php:39
+msgid "Upload a file"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204
-msgid "Clear OAuth configuration"
+#: ../../addon/js_upload/js_upload.php:40
+msgid "Drop files here to upload"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:42
+msgid "Failed"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:288
+msgid "No files were uploaded."
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:294
+msgid "Uploaded file is empty"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:299
+msgid "Uploaded file is too large"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:317
+msgid "File has an invalid extension, it should be one of "
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:328
+msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:78
@@ -2619,6 +2483,10 @@ msgstr ""
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
+#: ../../addon/statusnet/statusnet.php:197 ../../addon/twitter/twitter.php:165
+msgid "Currently connected to: "
+msgstr ""
+
 #: ../../addon/statusnet/statusnet.php:198
 msgid ""
 "If enabled all your <strong>public</strong> postings will be posted to the "
@@ -2629,147 +2497,121 @@ msgstr ""
 msgid "Send public postings to StatusNet"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:14
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:47
-msgid "3D Tic-Tac-Toe"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:52
-msgid "New game"
+#: ../../addon/statusnet/statusnet.php:204 ../../addon/twitter/twitter.php:172
+msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:53
-msgid "New game with handicap"
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:54
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:55
+#: ../../addon/twitter/twitter.php:129
 msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:57
+#: ../../addon/twitter/twitter.php:148
 msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:176
-msgid "You go first..."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:181
-msgid "I'm going first this time..."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:187
-msgid "You won!"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
-msgid "\"Cat\" game!"
+"At this Friendika instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:216
-msgid "I won!"
+#: ../../addon/twitter/twitter.php:149
+msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:33
-msgid "Select files to upload: "
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:35
+#: ../../addon/twitter/twitter.php:166
 msgid ""
-"Use the following controls only if the Java uploader [above] fails to launch."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:116
-msgid "Facebook disabled"
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated Twitter account as well."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:124
-msgid "Facebook API key is missing."
+#: ../../addon/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:131
-msgid "Facebook Connect"
+#: ../../include/profile_advanced.php:23 ../../boot.php:2331
+msgid "Gender:"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:137
-msgid "Install Facebook post connector"
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1071
+msgid "Birthday:"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:144
-msgid "Remove Facebook post connector"
+#: ../../include/profile_advanced.php:45
+msgid "j F, Y"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:150
-msgid "Post to Facebook by default"
+#: ../../include/profile_advanced.php:46
+msgid "j F"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:174
-msgid "Facebook"
+#: ../../include/profile_advanced.php:59
+msgid "Age:"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:175
-msgid "Facebook Connector Settings"
+#: ../../include/profile_advanced.php:70
+msgid "<span class=\"heart\">&hearts;</span> Status:"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:189
-msgid "Post to Facebook"
+#: ../../include/profile_advanced.php:103 ../../boot.php:2337
+msgid "Homepage:"
 msgstr ""
-
-#: ../../addon/facebook/facebook.php:230
-msgid "Image: "
+
+#: ../../include/profile_advanced.php:127
+msgid "Religion:"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:171
-msgid "Randplace Settings"
+#: ../../include/profile_advanced.php:138
+msgid "About:"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:173
-msgid "Enable Randplace Plugin"
+#: ../../include/profile_advanced.php:150
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:39
-msgid "Upload a file"
+#: ../../include/profile_advanced.php:162
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:40
-msgid "Drop files here to upload"
+#: ../../include/profile_advanced.php:174
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:42
-msgid "Failed"
+#: ../../include/profile_advanced.php:186
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:288
-msgid "No files were uploaded."
+#: ../../include/profile_advanced.php:198
+msgid "Television:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:294
-msgid "Uploaded file is empty"
+#: ../../include/profile_advanced.php:210
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:299
-msgid "Uploaded file is too large"
+#: ../../include/profile_advanced.php:222
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:317
-msgid "File has an invalid extension, it should be one of "
+#: ../../include/profile_advanced.php:234
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:328
-msgid "Upload was cancelled, or server error encountered"
+#: ../../include/profile_advanced.php:246
+msgid "School/education:"
 msgstr ""
 
 #: ../../include/contact_selectors.php:32
@@ -2904,323 +2746,564 @@ msgstr ""
 msgid "Autosexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Abstinent"
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr ""
+
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/group.php:145
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/group.php:146
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/nav.php:39 ../../boot.php:855
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:45 ../../boot.php:835 ../../boot.php:841
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:57 ../../include/nav.php:98
+msgid "Home"
+msgstr ""
+
+#: ../../include/nav.php:68
+msgid "Help"
+msgstr ""
+
+#: ../../include/nav.php:71
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:84
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:94
+msgid "Network"
+msgstr ""
+
+#: ../../include/nav.php:103
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:111
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:114
+msgid "Settings"
+msgstr ""
+
+#: ../../include/auth.php:27
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/datetime.php:44 ../../include/datetime.php:46
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../include/datetime.php:148
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:151
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:151
+msgid "years"
+msgstr ""
+
+#: ../../include/datetime.php:152
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:152
+msgid "months"
+msgstr ""
+
+#: ../../include/datetime.php:153
+msgid "week"
+msgstr ""
+
+#: ../../include/datetime.php:153
+msgid "weeks"
+msgstr ""
+
+#: ../../include/datetime.php:154
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:155
+msgid "hour"
+msgstr ""
+
+#: ../../include/datetime.php:155
+msgid "hours"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Virgin"
+#: ../../include/datetime.php:156
+msgid "minute"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Deviant"
+#: ../../include/datetime.php:156
+msgid "minutes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Fetish"
+#: ../../include/datetime.php:157
+msgid "second"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Oodles"
+#: ../../include/datetime.php:157
+msgid "seconds"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Nonsexual"
+#: ../../include/datetime.php:164
+msgid " ago"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Single"
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Lonely"
+#: ../../include/acl_selectors.php:132
+msgid "Visible To:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Available"
+#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
+msgid "Groups"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Unavailable"
+#: ../../include/acl_selectors.php:147
+msgid "Except For:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Dating"
+#: ../../include/items.php:1416
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Unfaithful"
+#: ../../include/conversation.php:116 ../../include/conversation.php:376
+#: ../../include/conversation.php:377
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Sex Addict"
+#: ../../include/conversation.php:132
+msgid "View in context"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Friends"
+#: ../../include/conversation.php:203
+msgid "See more posts like this"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Friends/Benefits"
+#: ../../include/conversation.php:227
+#, php-format
+msgid "See all %d comments"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Casual"
+#: ../../include/conversation.php:378
+msgid "to"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Engaged"
+#: ../../include/conversation.php:379
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Married"
+#: ../../include/conversation.php:380
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Partners"
+#: ../../boot.php:372
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Cohabiting"
+#: ../../boot.php:826
+msgid "Create a New Account"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Happy"
+#: ../../boot.php:833
+msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Not Looking"
+#: ../../boot.php:834
+msgid "Password: "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Swinger"
+#: ../../boot.php:839
+msgid "Nickname/Email/OpenID: "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Betrayed"
+#: ../../boot.php:840
+msgid "Password (if not OpenID): "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Separated"
+#: ../../boot.php:843
+msgid "Forgot your password?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Unstable"
+#: ../../boot.php:1096
+msgid "prev"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Divorced"
+#: ../../boot.php:1098
+msgid "first"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Widowed"
+#: ../../boot.php:1127
+msgid "last"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Uncertain"
+#: ../../boot.php:1130
+msgid "next"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Complicated"
+#: ../../boot.php:1861
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Don't care"
+#: ../../boot.php:1861
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Ask me"
+#: ../../boot.php:1865
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/acl_selectors.php:132
-msgid "Visible To:"
+#: ../../boot.php:1867
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
-msgid "Groups"
+#: ../../boot.php:1873
+msgid "and"
 msgstr ""
 
-#: ../../include/acl_selectors.php:147
-msgid "Except For:"
+#: ../../boot.php:1876
+#, php-format
+msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/auth.php:27
-msgid "Logged out."
+#: ../../boot.php:1877
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/datetime.php:44 ../../include/datetime.php:46
-msgid "Miscellaneous"
+#: ../../boot.php:1877
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/datetime.php:148
-msgid "less than a second ago"
+#: ../../boot.php:2038
+msgid "No contacts"
 msgstr ""
 
-#: ../../include/datetime.php:151
-msgid "year"
+#: ../../boot.php:2046
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../boot.php:2309
+msgid "Connect"
 msgstr ""
 
-#: ../../include/datetime.php:151
-msgid "years"
+#: ../../boot.php:2319
+msgid "Location:"
 msgstr ""
 
-#: ../../include/datetime.php:152
-msgid "month"
+#: ../../boot.php:2323
+msgid ", "
 msgstr ""
 
-#: ../../include/datetime.php:152
-msgid "months"
+#: ../../boot.php:2335
+msgid "Status:"
 msgstr ""
 
-#: ../../include/datetime.php:153
-msgid "week"
+#: ../../boot.php:2428
+msgid "Monday"
 msgstr ""
 
-#: ../../include/datetime.php:153
-msgid "weeks"
+#: ../../boot.php:2428
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/datetime.php:154
-msgid "day"
+#: ../../boot.php:2428
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/datetime.php:155
-msgid "hour"
+#: ../../boot.php:2428
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/datetime.php:155
-msgid "hours"
+#: ../../boot.php:2428
+msgid "Friday"
 msgstr ""
 
-#: ../../include/datetime.php:156
-msgid "minute"
+#: ../../boot.php:2428
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/datetime.php:156
-msgid "minutes"
+#: ../../boot.php:2428
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/datetime.php:157
-msgid "second"
+#: ../../boot.php:2432
+msgid "January"
 msgstr ""
 
-#: ../../include/datetime.php:157
-msgid "seconds"
+#: ../../boot.php:2432
+msgid "February"
 msgstr ""
 
-#: ../../include/datetime.php:164
-msgid " ago"
+#: ../../boot.php:2432
+msgid "March"
 msgstr ""
 
-#: ../../include/profile_advanced.php:36 ../../include/items.php:1073
-msgid "Birthday:"
+#: ../../boot.php:2432
+msgid "April"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45
-msgid "j F, Y"
+#: ../../boot.php:2432
+msgid "May"
 msgstr ""
 
-#: ../../include/profile_advanced.php:46
-msgid "j F"
+#: ../../boot.php:2432
+msgid "June"
 msgstr ""
 
-#: ../../include/profile_advanced.php:59
-msgid "Age:"
+#: ../../boot.php:2432
+msgid "July"
 msgstr ""
 
-#: ../../include/profile_advanced.php:70
-msgid "<span class=\"heart\">&hearts;</span> Status:"
+#: ../../boot.php:2432
+msgid "August"
 msgstr ""
 
-#: ../../include/profile_advanced.php:127
-msgid "Religion:"
+#: ../../boot.php:2432
+msgid "September"
 msgstr ""
 
-#: ../../include/profile_advanced.php:138
-msgid "About:"
+#: ../../boot.php:2432
+msgid "October"
 msgstr ""
 
-#: ../../include/profile_advanced.php:150
-msgid "Hobbies/Interests:"
+#: ../../boot.php:2432
+msgid "November"
 msgstr ""
 
-#: ../../include/profile_advanced.php:162
-msgid "Contact information and Social Networks:"
+#: ../../boot.php:2432
+msgid "December"
 msgstr ""
 
-#: ../../include/profile_advanced.php:174
-msgid "Musical interests:"
+#: ../../boot.php:2447
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/profile_advanced.php:186
-msgid "Books, literature:"
+#: ../../boot.php:2464
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/profile_advanced.php:198
-msgid "Television:"
+#: ../../boot.php:2465
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:210
-msgid "Film/dance/culture/entertainment:"
+#: ../../boot.php:2466
+msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../include/profile_advanced.php:222
-msgid "Love/Romance:"
+#: ../../boot.php:2477
+msgid "[today]"
 msgstr ""
 
-#: ../../include/profile_advanced.php:234
-msgid "Work/employment:"
+#: ../../boot.php:2674
+msgid "link to source"
 msgstr ""
 
-#: ../../include/profile_advanced.php:246
-msgid "School/education:"
+#: ../../boot.php:2765
+msgid "View status"
 msgstr ""
 
-#: ../../include/nav.php:57 ../../include/nav.php:92
-msgid "Home"
+#: ../../boot.php:2766
+msgid "View profile"
 msgstr ""
 
-#: ../../include/nav.php:65
-msgid "Apps"
+#: ../../boot.php:2767
+msgid "View photos"
 msgstr ""
 
-#: ../../include/nav.php:78
-msgid "Directory"
+#: ../../boot.php:2769
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Network"
+#: ../../wip/dfrn_poll2.php:72 ../../wip/dfrn_poll2.php:376
+msgid " welcomes "
 msgstr ""
 
-#: ../../include/nav.php:97
-msgid "Notifications"
+#: ../../wip/addon/facebook/facebook.php:54
+msgid "Facebook status update failed."
 msgstr ""
 
-#: ../../include/nav.php:105
-msgid "Manage"
+#: ../../wip/addon/js_upload/js_upload.php:213
+msgid "Could not save uploaded file."
 msgstr ""
 
-#: ../../include/nav.php:108
-msgid "Settings"
+#: ../../wip/addon/js_upload/js_upload.php:214
+msgid "The upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../include/dba.php:31
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../wip/addon/js_upload/js_upload.php:167
+msgid "Server error. Upload directory isn"
 msgstr ""
 
-#: ../../include/items.php:1418
-msgid "You have a new follower at "
+#: ../../wip/group.php:81
+msgid "Membership list updated."
 msgstr ""
 
-#: ../../include/group.php:145
-msgid "Create a new group"
+#: ../../wip/group.php:175
+msgid "Members:"
 msgstr ""
 
-#: ../../include/group.php:146
-msgid "Everybody"
+#: ../../index.php:208
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/oembed.php:57
-msgid "Embedding disabled"
+#: ../../index.php:209
+msgid "Page not found."
 msgstr ""

diff --git a/util/strings.php b/util/strings.php
index 835b86c702d0ffe31ca72a94ae1e1fb4c576cdfc..70b5b202b85f107c8ab71d976d4430f3ee609e55 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -71,6 +71,37 @@ $a->strings['%d Contact'] = array(
        0 => '%d Contact',
        1 => '%d Contacts',
 );
+$a->strings['Normal View'] = 'Normal View';
+$a->strings['New Item View'] = 'New Item View';
+$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.';
+$a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.';
+$a->strings['Please enter a link URL:'] = 'Please enter a link URL:';
+$a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
+$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
+$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
+$a->strings['Where are you right now?'] = 'Where are you right now?';
+$a->strings['Enter a title for this item'] = 'Enter a title for this item';
+$a->strings['Share'] = 'Share';
+$a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Insert web link'] = 'Insert web link';
+$a->strings['Insert YouTube video'] = 'Insert YouTube video';
+$a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
+$a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio';
+$a->strings['Set your location'] = 'Set your location';
+$a->strings['Clear browser location'] = 'Clear browser location';
+$a->strings['Set title'] = 'Set title';
+$a->strings['Please wait'] = 'Please wait';
+$a->strings['Permission settings'] = 'Permission settings';
+$a->strings['CC: email addresses'] = 'CC: email addresses';
+$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
+$a->strings['No such group'] = 'No such group';
+$a->strings['Group is empty'] = 'Group is empty';
+$a->strings['Group: '] = 'Group: ';
+$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
+$a->strings['%d member'] = array(
+       0 => '%d member',
+       1 => '%d members',
+);
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
@@ -195,33 +226,10 @@ $a->strings['Age: '] = 'Age: ';
 $a->strings['Gender: '] = 'Gender: ';
 $a->strings["No entries \x28some entries may be hidden\x29."] = "No entries \x28some entries may be hidden\x29.";
 $a->strings['Item not found.'] = 'Item not found.';
-$a->strings['Private Message'] = 'Private Message';
-$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
-$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
-$a->strings['Share'] = 'Share';
-$a->strings['Please wait'] = 'Please wait';
-$a->strings['This is you'] = 'This is you';
-$a->strings['Edit'] = 'Edit';
-$a->strings['Delete'] = 'Delete';
-$a->strings['View $name\'s profile'] = 'View $name\'s profile';
-$a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile';
-$a->strings['to'] = 'to';
-$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
-$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Item has been removed.'] = 'Item has been removed.';
-$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
 $a->strings['Item not found'] = 'Item not found';
 $a->strings['Edit post'] = 'Edit post';
-$a->strings['Upload photo'] = 'Upload photo';
-$a->strings['Insert web link'] = 'Insert web link';
-$a->strings['Insert YouTube video'] = 'Insert YouTube video';
-$a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
-$a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio';
-$a->strings['Set your location'] = 'Set your location';
-$a->strings['Clear browser location'] = 'Clear browser location';
-$a->strings['Permission settings'] = 'Permission settings';
-$a->strings['CC: email addresses'] = 'CC: email addresses';
-$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
+$a->strings['Edit'] = 'Edit';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
@@ -238,13 +246,15 @@ $a->strings['Group created.'] = 'Group created.';
 $a->strings['Could not create group.'] = 'Could not create group.';
 $a->strings['Group not found.'] = 'Group not found.';
 $a->strings['Group name changed.'] = 'Group name changed.';
-$a->strings['Membership list updated.'] = 'Membership list updated.';
 $a->strings['Create a group of contacts/friends.'] = 'Create a group of contacts/friends.';
 $a->strings['Group Name: '] = 'Group Name: ';
 $a->strings['Group removed.'] = 'Group removed.';
 $a->strings['Unable to remove group.'] = 'Unable to remove group.';
+$a->strings['Delete'] = 'Delete';
+$a->strings['Click on a contact to add or remove.'] = 'Click on a contact to add or remove.';
 $a->strings['Group Editor'] = 'Group Editor';
-$a->strings['Members:'] = 'Members:';
+$a->strings['Members'] = 'Members';
+$a->strings['All Contacts'] = 'All Contacts';
 $a->strings["Welcome to %s"] = "Welcome to %s";
 $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
 $a->strings['Connected to database.'] = 'Connected to database.';
@@ -339,7 +349,6 @@ $a->strings['Outbox'] = 'Outbox';
 $a->strings['New Message'] = 'New Message';
 $a->strings['Message deleted.'] = 'Message deleted.';
 $a->strings['Conversation removed.'] = 'Conversation removed.';
-$a->strings['Please enter a link URL:'] = 'Please enter a link URL:';
 $a->strings['Send Private Message'] = 'Send Private Message';
 $a->strings['To:'] = 'To:';
 $a->strings['Subject:'] = 'Subject:';
@@ -349,26 +358,6 @@ $a->strings['D, d M Y - g:i A'] = 'D, d M Y - g:i A';
 $a->strings['Message not available.'] = 'Message not available.';
 $a->strings['Delete message'] = 'Delete message';
 $a->strings['Send Reply'] = 'Send Reply';
-$a->strings['Normal View'] = 'Normal View';
-$a->strings['New Item View'] = 'New Item View';
-$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.';
-$a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.';
-$a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
-$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
-$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
-$a->strings['Where are you right now?'] = 'Where are you right now?';
-$a->strings['Enter a title for this item'] = 'Enter a title for this item';
-$a->strings['Set title'] = 'Set title';
-$a->strings['No such group'] = 'No such group';
-$a->strings['Group is empty'] = 'Group is empty';
-$a->strings['Group: '] = 'Group: ';
-$a->strings['View in context'] = 'View in context';
-$a->strings['See more posts like this'] = 'See more posts like this';
-$a->strings['See all %d comments'] = 'See all %d comments';
-$a->strings['%d member'] = array(
-       0 => '%d member',
-       1 => '%d members',
-);
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
@@ -413,6 +402,7 @@ $a->strings['Edit Album'] = 'Edit Album';
 $a->strings['View Photo'] = 'View Photo';
 $a->strings['Photo not available'] = 'Photo not available';
 $a->strings['Edit photo'] = 'Edit photo';
+$a->strings['Private Message'] = 'Private Message';
 $a->strings['<< Prev'] = '<< Prev';
 $a->strings['View Full Size'] = 'View Full Size';
 $a->strings['Next >>'] = 'Next >>';
@@ -422,6 +412,9 @@ $a->strings['New album name'] = 'New album name';
 $a->strings['Caption'] = 'Caption';
 $a->strings['Add a Tag'] = 'Add a Tag';
 $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
+$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
+$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
+$a->strings['This is you'] = 'This is you';
 $a->strings['Recent Photos'] = 'Recent Photos';
 $a->strings['Upload New Photos'] = 'Upload New Photos';
 $a->strings['View Album'] = 'View Album';
@@ -595,6 +588,13 @@ $a->strings['Twice daily'] = 'Twice daily';
 $a->strings['Daily'] = 'Daily';
 $a->strings['Weekly'] = 'Weekly';
 $a->strings['Monthly'] = 'Monthly';
+$a->strings['View %s\'s profile'] = 'View %s\'s profile';
+$a->strings['View in context'] = 'View in context';
+$a->strings['See more posts like this'] = 'See more posts like this';
+$a->strings['See all %d comments'] = 'See all %d comments';
+$a->strings['to'] = 'to';
+$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
+$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Miscellaneous'] = 'Miscellaneous';
 $a->strings['less than a second ago'] = 'less than a second ago';
 $a->strings['year'] = 'year';
@@ -616,6 +616,7 @@ $a->strings['Create a new group'] = 'Create a new group';
 $a->strings['Everybody'] = 'Everybody';
 $a->strings['Birthday:'] = 'Birthday:';
 $a->strings['Home'] = 'Home';
+$a->strings['Help'] = 'Help';
 $a->strings['Apps'] = 'Apps';
 $a->strings['Directory'] = 'Directory';
 $a->strings['Network'] = 'Network';
@@ -893,6 +894,7 @@ $a->strings['America/Managua'] = 'America/Managua';
 $a->strings['America/Manaus'] = 'America/Manaus';
 $a->strings['America/Marigot'] = 'America/Marigot';
 $a->strings['America/Martinique'] = 'America/Martinique';
+$a->strings['America/Matamoros'] = 'America/Matamoros';
 $a->strings['America/Mazatlan'] = 'America/Mazatlan';
 $a->strings['America/Mendoza'] = 'America/Mendoza';
 $a->strings['America/Menominee'] = 'America/Menominee';
@@ -911,6 +913,7 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
+$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@ -927,6 +930,7 @@ $a->strings['America/Regina'] = 'America/Regina';
 $a->strings['America/Resolute'] = 'America/Resolute';
 $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
 $a->strings['America/Rosario'] = 'America/Rosario';
+$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
 $a->strings['America/Santarem'] = 'America/Santarem';
 $a->strings['America/Santiago'] = 'America/Santiago';
 $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@@ -955,6 +959,7 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
 $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
 $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
 $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
+$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
 $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
 $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
 $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@ -1017,6 +1022,7 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
+$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';