Merge branch 'master' of github.com:fabrixxm/friendika

diff --combined boot.php
index 211cbb0082e900195c31b930fc7c53151e665205,50b4fd88788192d2afb73da6b1f946ee8135aa2a..0b5787abac4678fd0ff18ca4e2b38032b0e3afc7
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -2,9 -2,9 +2,9 @@@
  
  set_time_limit(0);
  
- define ( 'FRIENDIKA_VERSION',      '2.1.921' );
+ define ( 'FRIENDIKA_VERSION',      '2.1.925' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
- define ( 'DB_UPDATE_VERSION',      1043   );
+ define ( 'DB_UPDATE_VERSION',      1044   );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@@ -1603,9 -1603,15 +1603,15 @@@ function lrdd($uri) 
  if(! function_exists('fetch_lrdd_template')) {
  function fetch_lrdd_template($host) {
        $tpl = '';
-       $url = 'http://' . $host . '/.well-known/host-meta' ;
-       $links = fetch_xrd_links($url);
- logger('template: ' . print_r($links,true));
+ 
+       $url1 = 'https://' . $host . '/.well-known/host-meta' ;
+       $url2 = 'http://' . $host . '/.well-known/host-meta' ;
+       $links = fetch_xrd_links($url1);
+       logger('template (https): ' . print_r($links,true));
+       if(! count($links)) {
+               $links = fetch_xrd_links($url2);
+               logger('template (http): ' . print_r($links,true));
+       }
        if(count($links)) {
                foreach($links as $link)
                        if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd')
@@@ -1856,11 -1862,11 +1862,11 @@@ function format_like($cnt,$arr,$type,$i
  
  if(! function_exists('load_view_file')) {
  function load_view_file($s) {
+       global $lang;
+       if(! isset($lang))
+               $lang = 'en';
        $b = basename($s);
        $d = dirname($s);
-       $lang = get_config('system','language');
-       if($lang === false)
-               $lang = 'en';
        if(file_exists("$d/$lang/$b"))
                return file_get_contents("$d/$lang/$b");
        return file_get_contents($s);
@@@ -2013,7 -2019,7 +2019,7 @@@ function contact_block() 
                        intval($shown)
        );
        if(count($r)) {
 -              $o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">';
 +              $o .= '<h4 class="contact-h4">' .  sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
                foreach($r as $rr) {
                        $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
                        if(local_user() && ($rr['uid'] == local_user())
@@@ -2659,4 -2665,4 +2665,4 @@@ function extract_item_authors($arr,$uid
                }
        }
        return array();         
 -}}
 +}}

diff --combined util/messages.po
index e083c2a4c65a878d695f288da640c0161509d208,1c0c880e97bd776f003793771685db8e7cb89142..beff3e4b64aa23b09179099fd75d81e842b70db7
--- 1/util/messages.po
--- 2/util/messages.po
+++ b/util/messages.po
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: 2.1.921\n"
+ "Project-Id-Version: 2.1.925\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2011-03-23 13:47+0100\n"
 -"POT-Creation-Date: 2011-03-22 08:15+0100\n"
++"POT-Creation-Date: 2011-03-23 14:03+0100\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"
@@@ -18,637 -18,743 +18,670 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
 -#: ../../mod/network.php:6 ../../mod/profiles.php:7 ../../mod/profiles.php:227
 -#: ../../mod/notifications.php:56 ../../mod/install.php:93
 -#: ../../mod/message.php:8 ../../mod/message.php:116 ../../mod/manage.php:75
 -#: ../../mod/dfrn_confirm.php:53 ../../mod/wall_upload.php:42
 -#: ../../mod/display.php:308 ../../mod/regmod.php:16 ../../mod/photos.php:85
 -#: ../../mod/photos.php:773 ../../mod/viewcontacts.php:13
 -#: ../../mod/editpost.php:10 ../../mod/settings.php:14
 -#: ../../mod/settings.php:19 ../../mod/settings.php:210 ../../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/group.php:19
 -#: ../../mod/invite.php:13 ../../mod/invite.php:50 ../../mod/register.php:25
 -#: ../../mod/follow.php:8 ../../mod/contacts.php:106
 -#: ../../addon/facebook/facebook.php:110 ../../index.php:251
 -msgid "Permission denied."
 +#: ../../index.php:194
 +msgid "Not Found"
  msgstr ""
  
 -#: ../../mod/network.php:18
 -msgid "Normal View"
 +#: ../../index.php:195
 +msgid "Page not found."
  msgstr ""
  
 -#: ../../mod/network.php:20
 -msgid "New Item View"
 +#: ../../index.php:250 ../../mod/group.php:88
 +msgid "Permission denied"
  msgstr ""
  
 -#: ../../mod/network.php:69 ../../mod/message.php:172
 -#: ../../mod/profile.php:137
 -msgid "Please enter a link URL:"
 +#: ../../index.php:251 ../../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:14 ../../mod/settings.php:19
- #: ../../mod/settings.php:208 ../../mod/photos.php:85 ../../mod/photos.php:773
++#: ../../mod/settings.php:210 ../../mod/photos.php:85 ../../mod/photos.php:773
 +#: ../../mod/display.php:308 ../../mod/editpost.php:10 ../../mod/invite.php:13
- #: ../../mod/invite.php:50 ../../mod/contacts.php:101
- #: ../../mod/register.php:25 ../../mod/network.php:6
++#: ../../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."
  msgstr ""
  
 -#: ../../mod/network.php:70 ../../mod/profile.php:138
 -msgid "Please enter a YouTube link:"
 +#: ../../boot.php:808
 +msgid "Create a New Account"
  msgstr ""
  
 -#: ../../mod/network.php:71 ../../mod/profile.php:139
 -msgid "Please enter a video(.ogg) link/URL:"
 +#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61
 +msgid "Register"
  msgstr ""
  
 -#: ../../mod/network.php:72 ../../mod/profile.php:140
 -msgid "Please enter an audio(.ogg) link/URL:"
 +#: ../../boot.php:815
 +msgid "Nickname or Email address: "
  msgstr ""
  
 -#: ../../mod/network.php:73 ../../mod/profile.php:141
 -msgid "Where are you right now?"
 +#: ../../boot.php:816
 +msgid "Password: "
  msgstr ""
  
 -#: ../../mod/network.php:96 ../../mod/network.php:375
 -#: ../../mod/display.php:158 ../../mod/photos.php:1086
 -#: ../../mod/profile.php:164 ../../mod/profile.php:325
 -msgid "Share"
 +#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
 +msgid "Login"
  msgstr ""
  
 -#: ../../mod/network.php:97 ../../mod/message.php:186
 -#: ../../mod/message.php:320 ../../mod/profile.php:165
 -#: ../../mod/editpost.php:63
 -msgid "Upload photo"
 +#: ../../boot.php:821
 +msgid "Nickname/Email/OpenID: "
  msgstr ""
  
 -#: ../../mod/network.php:98 ../../mod/message.php:187
 -#: ../../mod/message.php:321 ../../mod/profile.php:166
 -#: ../../mod/editpost.php:64
 -msgid "Insert web link"
 +#: ../../boot.php:822
 +msgid "Password (if not OpenID): "
  msgstr ""
  
 -#: ../../mod/network.php:99 ../../mod/profile.php:167
 -#: ../../mod/editpost.php:65
 -msgid "Insert YouTube video"
 +#: ../../boot.php:825
 +msgid "Forgot your password?"
  msgstr ""
  
 -#: ../../mod/network.php:100 ../../mod/profile.php:168
 -#: ../../mod/editpost.php:66
 -msgid "Insert Vorbis [.ogg] video"
 +#: ../../boot.php:826
 +msgid "Password Reset"
  msgstr ""
  
 -#: ../../mod/network.php:101 ../../mod/profile.php:169
 -#: ../../mod/editpost.php:67
 -msgid "Insert Vorbis [.ogg] audio"
 +#: ../../boot.php:837 ../../include/nav.php:38
 +msgid "Logout"
  msgstr ""
  
 -#: ../../mod/network.php:102 ../../mod/profile.php:170
 -#: ../../mod/editpost.php:68
 -msgid "Set your location"
 +#: ../../boot.php:1077
 +msgid "prev"
  msgstr ""
  
 -#: ../../mod/network.php:103 ../../mod/profile.php:171
 -#: ../../mod/editpost.php:69
 -msgid "Clear browser location"
 +#: ../../boot.php:1079
 +msgid "first"
  msgstr ""
  
 -#: ../../mod/network.php:104 ../../mod/network.php:376
 -#: ../../mod/message.php:188 ../../mod/message.php:322
 -#: ../../mod/display.php:159 ../../mod/photos.php:1087
 -#: ../../mod/profile.php:172 ../../mod/profile.php:326
 -#: ../../mod/editpost.php:70
 -msgid "Please wait"
 +#: ../../boot.php:1108
 +msgid "last"
  msgstr ""
  
 -#: ../../mod/network.php:105 ../../mod/profile.php:173
 -#: ../../mod/editpost.php:71
 -msgid "Permission settings"
 +#: ../../boot.php:1111
 +msgid "next"
  msgstr ""
  
- #: ../../boot.php:1831
 -#: ../../mod/network.php:111 ../../mod/profile.php:180
 -#: ../../mod/editpost.php:77
 -msgid "CC: email addresses"
++#: ../../boot.php:1837
 +#, php-format
 +msgid "%s likes this."
  msgstr ""
  
- #: ../../boot.php:1831
 -#: ../../mod/network.php:113 ../../mod/profile.php:182
 -#: ../../mod/editpost.php:79
 -msgid "Example: bob@example.com, mary@example.com"
++#: ../../boot.php:1837
 +#, php-format
 +msgid "%s doesn't like this."
  msgstr ""
  
- #: ../../boot.php:1835 ../../test.php:8
 -#: ../../mod/network.php:156
 -msgid "No such group"
++#: ../../boot.php:1841 ../../test.php:8
 +#, php-format
 +msgid "<span  %1$s>%2$d people</span> like this."
  msgstr ""
  
- #: ../../boot.php:1837
 -#: ../../mod/network.php:167
 -msgid "Group is empty"
++#: ../../boot.php:1843
 +#, php-format
 +msgid "<span  %1$s>%2$d people</span> don't like this."
  msgstr ""
  
- #: ../../boot.php:1843
 -#: ../../mod/network.php:171
 -msgid "Group: "
++#: ../../boot.php:1849
 +msgid "and"
  msgstr ""
  
- #: ../../boot.php:1846
 -#: ../../mod/network.php:280 ../../mod/network.php:446
 -#: ../../mod/display.php:262 ../../mod/profile.php:405
 -#: ../../mod/search.php:116
 -msgid "View $name's profile"
++#: ../../boot.php:1852
 +#, php-format
 +msgid ", and %d other people"
  msgstr ""
  
- #: ../../boot.php:1847
 -#: ../../mod/network.php:295 ../../mod/search.php:131
 -msgid "View in context"
++#: ../../boot.php:1853
 +#, php-format
 +msgid "%s like this."
  msgstr ""
  
- #: ../../boot.php:1847
 -#: ../../mod/network.php:329 ../../mod/display.php:149
 -#: ../../mod/photos.php:962 ../../mod/profile.php:316
 -msgid "Private Message"
++#: ../../boot.php:1853
 +#, php-format
 +msgid "%s don't like this."
  msgstr ""
  
- #: ../../boot.php:2008
 -#: ../../mod/network.php:373 ../../mod/display.php:156
 -#: ../../mod/photos.php:1084 ../../mod/profile.php:323
 -msgid "I like this (toggle)"
++#: ../../boot.php:2014
 +msgid "No contacts"
  msgstr ""
  
- #: ../../boot.php:2016
 -#: ../../mod/network.php:374 ../../mod/display.php:157
 -#: ../../mod/photos.php:1085 ../../mod/profile.php:324
 -msgid "I don't like this (toggle)"
++#: ../../boot.php:2022
 +#, php-format
 +msgid "%d Contact"
 +msgid_plural "%d Contacts"
 +msgstr[0] ""
 +msgstr[1] ""
 +
- #: ../../boot.php:2032 ../../mod/viewcontacts.php:17
++#: ../../boot.php:2038 ../../mod/viewcontacts.php:17
 +msgid "View Contacts"
  msgstr ""
  
- #: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67
 -#: ../../mod/network.php:389 ../../mod/display.php:171
 -#: ../../mod/photos.php:1106 ../../mod/photos.php:1146
 -#: ../../mod/photos.php:1175 ../../mod/profile.php:338
 -msgid "This is you"
++#: ../../boot.php:2055 ../../mod/search.php:17 ../../include/nav.php:67
 +msgid "Search"
  msgstr ""
  
- #: ../../boot.php:2204 ../../mod/profile.php:8
 -#: ../../mod/network.php:397 ../../mod/display.php:222
 -#: ../../mod/profile.php:362 ../../mod/editpost.php:62
 -msgid "Edit"
++#: ../../boot.php:2210 ../../mod/profile.php:8
 +msgid "No profile"
  msgstr ""
  
- #: ../../boot.php:2261
 -#: ../../mod/network.php:398 ../../mod/display.php:238
 -#: ../../mod/photos.php:1203 ../../mod/profile.php:384 ../../mod/group.php:137
 -msgid "Delete"
++#: ../../boot.php:2267
 +msgid "Connect"
  msgstr ""
  
- #: ../../boot.php:2271
 -#: ../../mod/network.php:447 ../../mod/display.php:263
 -msgid "View $owner_name's profile"
++#: ../../boot.php:2277
 +msgid "Location:"
  msgstr ""
  
- #: ../../boot.php:2275
 -#: ../../mod/network.php:448 ../../mod/display.php:264
 -msgid "to"
++#: ../../boot.php:2281
 +msgid ", "
  msgstr ""
  
- #: ../../boot.php:2283
 -#: ../../mod/network.php:449 ../../mod/display.php:265
 -msgid "Wall-to-Wall"
++#: ../../boot.php:2289
 +msgid "Gender:"
  msgstr ""
  
- #: ../../boot.php:2287
 -#: ../../mod/network.php:450 ../../mod/display.php:266
 -msgid "via Wall-To-Wall:"
++#: ../../boot.php:2293
 +msgid "Status:"
  msgstr ""
  
- #: ../../boot.php:2289
 -#: ../../mod/network.php:484 ../../mod/display.php:317
 -#: ../../mod/profile.php:438 ../../mod/register.php:424
 -msgid ""
 -"Shared content is covered by the <a href=\"http://creativecommons.org/"
 -"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
++#: ../../boot.php:2295
 +msgid "Homepage:"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
 -#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
 -msgid "Profile not found."
++#: ../../boot.php:2386
 +msgid "Monday"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:28
 -msgid "Profile Name is required."
++#: ../../boot.php:2386
 +msgid "Tuesday"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:199
 -msgid "Profile updated."
++#: ../../boot.php:2386
 +msgid "Wednesday"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:254
 -msgid "Profile deleted."
++#: ../../boot.php:2386
 +msgid "Thursday"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
 -msgid "Profile-"
++#: ../../boot.php:2386
 +msgid "Friday"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
 -msgid "New profile created."
++#: ../../boot.php:2386
 +msgid "Saturday"
  msgstr ""
  
- #: ../../boot.php:2380
 -#: ../../mod/profiles.php:307
 -msgid "Profile unavailable to clone."
++#: ../../boot.php:2386
 +msgid "Sunday"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/profiles.php:370
 -msgid ""
 -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 -"be visible to anybody using the internet."
++#: ../../boot.php:2390
 +msgid "January"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/profiles.php:380
 -msgid "Age: "
++#: ../../boot.php:2390
 +msgid "February"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/profiles.php:422
 -msgid "Profile Image"
++#: ../../boot.php:2390
 +msgid "March"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/lostpass.php:38
 -#, php-format
 -msgid "Password reset requested at %s"
++#: ../../boot.php:2390
 +msgid "April"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/lostpass.php:39 ../../mod/dfrn_confirm.php:649
 -#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389
 -#: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93
 -#: ../../mod/item.php:475 ../../mod/item.php:498 ../../mod/register.php:311
 -#: ../../mod/register.php:348 ../../mod/dfrn_request.php:545
 -#: ../../include/items.php:1373
 -msgid "Administrator"
++#: ../../boot.php:2390
 +msgid "May"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:28
 -msgid "Invalid request identifier."
++#: ../../boot.php:2390
 +msgid "June"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
 -msgid "Discard"
++#: ../../boot.php:2390
 +msgid "July"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
 -msgid "Ignore"
++#: ../../boot.php:2390
 +msgid "August"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:72
 -msgid "Show Ignored Requests"
++#: ../../boot.php:2390
 +msgid "September"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:72
 -msgid "Hide Ignored Requests"
++#: ../../boot.php:2390
 +msgid "October"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:105
 -msgid "Claims to be known to you: "
++#: ../../boot.php:2390
 +msgid "November"
  msgstr ""
  
- #: ../../boot.php:2384
 -#: ../../mod/notifications.php:105
 -msgid "yes"
++#: ../../boot.php:2390
 +msgid "December"
  msgstr ""
  
- #: ../../boot.php:2418
 -#: ../../mod/notifications.php:105
 -msgid "no"
++#: ../../boot.php:2424
 +msgid "Birthday Reminders"
  msgstr ""
  
- #: ../../boot.php:2419
 -#: ../../mod/notifications.php:111
 -msgid "Approve as: "
++#: ../../boot.php:2425
 +msgid "Birthdays this week:"
  msgstr ""
  
- #: ../../boot.php:2420
 -#: ../../mod/notifications.php:112
 -msgid "Friend"
++#: ../../boot.php:2426
 +msgid "(Adjusted for local time)"
  msgstr ""
  
- #: ../../boot.php:2431
 -#: ../../mod/notifications.php:113
 -msgid "Fan/Admirer"
++#: ../../boot.php:2437
 +msgid "[today]"
  msgstr ""
  
- #: ../../boot.php:2628
 -#: ../../mod/notifications.php:120
 -msgid "Notification type: "
++#: ../../boot.php:2634
 +msgid "link to source"
  msgstr ""
  
 -#: ../../mod/notifications.php:121
 -msgid "Friend/Connect Request"
 +#: ../../mod/manage.php:37
 +#, php-format
 +msgid "Welcome back %s"
  msgstr ""
  
 -#: ../../mod/notifications.php:121
 -msgid "New Follower"
 +#: ../../mod/manage.php:87
 +msgid "Manage Identities and/or Pages"
  msgstr ""
  
 -#: ../../mod/notifications.php:131
 -msgid "Approve"
 +#: ../../mod/manage.php:90
 +msgid ""
 +"(Toggle between different identities or community/group pages which share "
 +"your account details.)"
  msgstr ""
  
 -#: ../../mod/notifications.php:140
 -msgid "No notifications."
 +#: ../../mod/manage.php:92
 +msgid "Select an identity to manage: "
  msgstr ""
  
 -#: ../../mod/notifications.php:164
 -msgid "No registrations."
 +#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858
- #: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:109
++#: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:123
 +#: ../../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"
  msgstr ""
  
 -#: ../../mod/install.php:33
 -msgid "Could not create/connect to database."
 +#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
 +#, php-format
 +msgid "Image exceeds size limit of %d"
  msgstr ""
  
 -#: ../../mod/install.php:38
 -msgid "Connected to database."
 -msgstr ""
 -
 -#: ../../mod/install.php:72
 -msgid "Proceed with Installation"
 -msgstr ""
 -
 -#: ../../mod/install.php:74
 -msgid "Your Friendika site database has been installed."
 -msgstr ""
 -
 -#: ../../mod/install.php:75
 -msgid ""
 -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 -msgstr ""
 -
 -#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
 -msgid "Please see the file \"INSTALL.txt\"."
 -msgstr ""
 -
 -#: ../../mod/install.php:78
 -msgid "Proceed to registration"
 -msgstr ""
 -
 -#: ../../mod/install.php:84
 -msgid "Database import failed."
 -msgstr ""
 -
 -#: ../../mod/install.php:85
 -msgid ""
 -"You may need to import the file \"database.sql\" manually using phpmyadmin "
 -"or mysql."
 -msgstr ""
 -
 -#: ../../mod/install.php:98
 -msgid "Welcome to Friendika."
 -msgstr ""
 -
 -#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/photos.php:801
 -#: ../../mod/photos.php:858 ../../mod/photos.php:1066 ../../mod/invite.php:64
 -#: ../../addon/facebook/facebook.php:151
 -#: ../../addon/randplace/randplace.php:179 ../../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
 -msgid "Submit"
 +#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
 +#: ../../mod/photos.php:571
 +msgid "Unable to process image."
  msgstr ""
  
 -#: ../../mod/install.php:138
 -msgid "Could not find a command line version of PHP in the web server PATH."
 +#: ../../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"
  msgstr ""
  
 -#: ../../mod/install.php:139
 -msgid ""
 -"This is required. Please adjust the configuration file .htconfig.php "
 -"accordingly."
 +#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
 +#: ../../mod/photos.php:589
 +msgid "Image upload failed."
  msgstr ""
  
 -#: ../../mod/install.php:146
 -msgid ""
 -"The command line version of PHP on your system does not have "
 -"\"register_argc_argv\" enabled."
 +#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389
 +#: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93
 +#: ../../mod/register.php:311 ../../mod/register.php:348
 +#: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39
 +#: ../../mod/item.php:475 ../../mod/item.php:498
 +#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373
 +msgid "Administrator"
  msgstr ""
  
 -#: ../../mod/install.php:147
 -msgid "This is required for message delivery to work."
 +#: ../../mod/dfrn_notify.php:179
 +msgid "noreply"
  msgstr ""
  
 -#: ../../mod/install.php:169
 -msgid ""
 -"Error: the \"openssl_pkey_new\" function on this system is not able to "
 -"generate encryption keys"
 +#: ../../mod/dfrn_notify.php:237
 +msgid "New mail received at "
  msgstr ""
  
 -#: ../../mod/install.php:170
 -msgid ""
 -"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 -"installation.php\"."
 +#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
 +#, php-format
 +msgid "%s commented on an item at %s"
  msgstr ""
  
- #: ../../mod/profile.php:156 ../../mod/profile.php:317
 -#: ../../mod/install.php:179
 -msgid ""
 -"Error: Apache webserver mod-rewrite module is required but not installed."
++#: ../../mod/profile.php:102
++msgid "Status"
+ msgstr ""
+ 
 -#: ../../mod/install.php:181
 -msgid "Error: libCURL PHP module required but not installed."
++#: ../../mod/profile.php:103
++msgid "Profile"
+ msgstr ""
+ 
 -#: ../../mod/install.php:183
 -msgid ""
 -"Error: GD graphics PHP module with JPEG support required but not installed."
++#: ../../mod/profile.php:104
++msgid "Photos"
+ msgstr ""
+ 
 -#: ../../mod/install.php:185
 -msgid "Error: openssl PHP module required but not installed."
++#: ../../mod/profile.php:137 ../../mod/network.php:69
++#: ../../mod/message.php:172
++msgid "Please enter a link URL:"
+ msgstr ""
+ 
 -#: ../../mod/install.php:187
 -msgid "Error: mysqli PHP module required but not installed."
++#: ../../mod/profile.php:138 ../../mod/network.php:70
++msgid "Please enter a YouTube link:"
+ msgstr ""
+ 
 -#: ../../mod/install.php:198
 -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."
++#: ../../mod/profile.php:139 ../../mod/network.php:71
++msgid "Please enter a video(.ogg) link/URL:"
+ msgstr ""
+ 
 -#: ../../mod/install.php:199
 -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."
++#: ../../mod/profile.php:140 ../../mod/network.php:72
++msgid "Please enter an audio(.ogg) link/URL:"
+ msgstr ""
+ 
 -#: ../../mod/install.php:200
 -msgid ""
 -"Please check with your site documentation or support people to see if this "
 -"situation can be corrected."
++#: ../../mod/profile.php:141 ../../mod/network.php:73
++msgid "Where are you right now?"
+ msgstr ""
+ 
 -#: ../../mod/install.php:201
 -msgid ""
 -"If not, you may be required to perform a manual installation. Please see the "
 -"file \"INSTALL.txt\" for instructions."
++#: ../../mod/profile.php:164 ../../mod/profile.php:325
 +#: ../../mod/photos.php:1086 ../../mod/display.php:158
- #: ../../mod/network.php:91 ../../mod/network.php:370
++#: ../../mod/network.php:96 ../../mod/network.php:375
 +msgid "Share"
  msgstr ""
  
- #: ../../mod/profile.php:157 ../../mod/editpost.php:63
- #: ../../mod/network.php:92 ../../mod/message.php:185
- #: ../../mod/message.php:319
 -#: ../../mod/install.php:210
 -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."
++#: ../../mod/profile.php:165 ../../mod/editpost.php:63
++#: ../../mod/network.php:97 ../../mod/message.php:186
++#: ../../mod/message.php:320
 +msgid "Upload photo"
  msgstr ""
  
- #: ../../mod/profile.php:158 ../../mod/editpost.php:64
- #: ../../mod/network.php:93 ../../mod/message.php:186
- #: ../../mod/message.php:320
 -#: ../../mod/install.php:225
 -msgid "Errors encountered creating database tables."
++#: ../../mod/profile.php:166 ../../mod/editpost.php:64
++#: ../../mod/network.php:98 ../../mod/message.php:187
++#: ../../mod/message.php:321
 +msgid "Insert web link"
  msgstr ""
  
- #: ../../mod/profile.php:159 ../../mod/editpost.php:65
- #: ../../mod/network.php:94
 -#: ../../mod/message.php:18
 -msgid "No recipient selected."
++#: ../../mod/profile.php:167 ../../mod/editpost.php:65
++#: ../../mod/network.php:99
 +msgid "Insert YouTube video"
  msgstr ""
  
- #: ../../mod/profile.php:160 ../../mod/editpost.php:66
- #: ../../mod/network.php:95
 -#: ../../mod/message.php:23
 -msgid "[no subject]"
++#: ../../mod/profile.php:168 ../../mod/editpost.php:66
++#: ../../mod/network.php:100
 +msgid "Insert Vorbis [.ogg] video"
  msgstr ""
  
- #: ../../mod/profile.php:161 ../../mod/editpost.php:67
- #: ../../mod/network.php:96
 -#: ../../mod/message.php:34
 -msgid "Unable to locate contact information."
++#: ../../mod/profile.php:169 ../../mod/editpost.php:67
++#: ../../mod/network.php:101
 +msgid "Insert Vorbis [.ogg] audio"
  msgstr ""
  
- #: ../../mod/profile.php:162 ../../mod/editpost.php:68
- #: ../../mod/network.php:97
 -#: ../../mod/message.php:93 ../../mod/wall_upload.php:79
 -#: ../../mod/wall_upload.php:88 ../../mod/wall_upload.php:95
 -#: ../../mod/item.php:212
 -msgid "Wall Photos"
++#: ../../mod/profile.php:170 ../../mod/editpost.php:68
++#: ../../mod/network.php:102
 +msgid "Set your location"
  msgstr ""
  
- #: ../../mod/profile.php:163 ../../mod/editpost.php:69
- #: ../../mod/network.php:98
 -#: ../../mod/message.php:102
 -msgid "Message sent."
++#: ../../mod/profile.php:171 ../../mod/editpost.php:69
++#: ../../mod/network.php:103
 +msgid "Clear browser location"
  msgstr ""
  
- #: ../../mod/profile.php:164 ../../mod/profile.php:318
 -#: ../../mod/message.php:105
 -msgid "Message could not be sent."
++#: ../../mod/profile.php:172 ../../mod/profile.php:326
 +#: ../../mod/photos.php:1087 ../../mod/display.php:159
- #: ../../mod/editpost.php:70 ../../mod/network.php:99
- #: ../../mod/network.php:371 ../../mod/message.php:187
- #: ../../mod/message.php:321
++#: ../../mod/editpost.php:70 ../../mod/network.php:104
++#: ../../mod/network.php:376 ../../mod/message.php:188
++#: ../../mod/message.php:322
 +msgid "Please wait"
  msgstr ""
  
- #: ../../mod/profile.php:165 ../../mod/editpost.php:71
- #: ../../mod/network.php:100
 -#: ../../mod/message.php:125 ../../include/nav.php:100
 -msgid "Messages"
++#: ../../mod/profile.php:173 ../../mod/editpost.php:71
++#: ../../mod/network.php:105
 +msgid "Permission settings"
  msgstr ""
  
- #: ../../mod/profile.php:172 ../../mod/editpost.php:77
- #: ../../mod/network.php:106
 -#: ../../mod/message.php:126
 -msgid "Inbox"
++#: ../../mod/profile.php:180 ../../mod/editpost.php:77
++#: ../../mod/network.php:111
 +msgid "CC: email addresses"
  msgstr ""
  
- #: ../../mod/profile.php:174 ../../mod/editpost.php:79
- #: ../../mod/network.php:108
 -#: ../../mod/message.php:127
 -msgid "Outbox"
++#: ../../mod/profile.php:182 ../../mod/editpost.php:79
++#: ../../mod/network.php:113
 +msgid "Example: bob@example.com, mary@example.com"
  msgstr ""
  
- #: ../../mod/profile.php:308 ../../mod/photos.php:962
- #: ../../mod/display.php:149 ../../mod/network.php:324
 -#: ../../mod/message.php:128
 -msgid "New Message"
++#: ../../mod/profile.php:316 ../../mod/photos.php:962
++#: ../../mod/display.php:149 ../../mod/network.php:329
 +msgid "Private Message"
  msgstr ""
  
- #: ../../mod/profile.php:315 ../../mod/photos.php:1084
- #: ../../mod/display.php:156 ../../mod/network.php:368
 -#: ../../mod/message.php:142
 -msgid "Message deleted."
++#: ../../mod/profile.php:323 ../../mod/photos.php:1084
++#: ../../mod/display.php:156 ../../mod/network.php:373
 +msgid "I like this (toggle)"
  msgstr ""
  
- #: ../../mod/profile.php:316 ../../mod/photos.php:1085
- #: ../../mod/display.php:157 ../../mod/network.php:369
 -#: ../../mod/message.php:158
 -msgid "Conversation removed."
++#: ../../mod/profile.php:324 ../../mod/photos.php:1085
++#: ../../mod/display.php:157 ../../mod/network.php:374
 +msgid "I don't like this (toggle)"
  msgstr ""
  
- #: ../../mod/profile.php:330 ../../mod/photos.php:1106
 -#: ../../mod/message.php:178
 -msgid "Send Private Message"
++#: ../../mod/profile.php:338 ../../mod/photos.php:1106
 +#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
- #: ../../mod/display.php:171 ../../mod/network.php:384
++#: ../../mod/display.php:171 ../../mod/network.php:389
 +msgid "This is you"
  msgstr ""
  
- #: ../../mod/profile.php:354 ../../mod/display.php:222
- #: ../../mod/editpost.php:62 ../../mod/network.php:392
 -#: ../../mod/message.php:179 ../../mod/message.php:313
 -msgid "To:"
++#: ../../mod/profile.php:362 ../../mod/display.php:222
++#: ../../mod/editpost.php:62 ../../mod/network.php:397
 +msgid "Edit"
  msgstr ""
  
- #: ../../mod/profile.php:376 ../../mod/photos.php:1203
- #: ../../mod/display.php:238 ../../mod/network.php:393 ../../mod/group.php:137
 -#: ../../mod/message.php:180 ../../mod/message.php:314
 -msgid "Subject:"
++#: ../../mod/profile.php:384 ../../mod/photos.php:1203
++#: ../../mod/display.php:238 ../../mod/network.php:398 ../../mod/group.php:137
 +msgid "Delete"
  msgstr ""
  
- #: ../../mod/profile.php:397 ../../mod/search.php:116
- #: ../../mod/display.php:262 ../../mod/network.php:275
- #: ../../mod/network.php:441
 -#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59
 -msgid "Your message:"
++#: ../../mod/profile.php:405 ../../mod/search.php:116
++#: ../../mod/display.php:262 ../../mod/network.php:280
++#: ../../mod/network.php:446
 +msgid "View $name's profile"
  msgstr ""
  
- #: ../../mod/profile.php:430 ../../mod/display.php:317
- #: ../../mod/register.php:424 ../../mod/network.php:479
 -#: ../../mod/message.php:222
 -msgid "No messages."
++#: ../../mod/profile.php:438 ../../mod/display.php:317
++#: ../../mod/register.php:424 ../../mod/network.php:484
 +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/follow.php:167
 -#: ../../mod/message.php:235
 -msgid "Delete conversation"
++#: ../../mod/follow.php:173
 +msgid "The profile address specified does not provide adequate information."
  msgstr ""
  
- #: ../../mod/follow.php:173
 -#: ../../mod/message.php:265
 -msgid "Message not available."
++#: ../../mod/follow.php:179
 +msgid ""
 +"Limited profile. This person will be unable to receive direct/personal "
 +"notifications from you."
  msgstr ""
  
- #: ../../mod/follow.php:224
 -#: ../../mod/message.php:302
 -msgid "Delete message"
++#: ../../mod/follow.php:230
 +msgid "Unable to retrieve contact information."
  msgstr ""
  
- #: ../../mod/follow.php:270
 -#: ../../mod/message.php:312
 -msgid "Send Reply"
++#: ../../mod/follow.php:276
 +msgid "following"
  msgstr ""
  
 -#: ../../mod/directory.php:32
 -msgid "Global Directory"
 +#: ../../mod/profile_photo.php:28
 +msgid "Image uploaded but image cropping failed."
  msgstr ""
  
 -#: ../../mod/directory.php:38 ../../mod/contacts.php:315
 -msgid "Finding: "
 +#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
 +#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
 +#: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234
 +#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
 +#: ../../mod/photos.php:865 ../../mod/register.php:267
 +#: ../../mod/register.php:274 ../../mod/register.php:281
 +msgid "Profile Photos"
  msgstr ""
  
 -#: ../../mod/manage.php:37
 +#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
 +#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
  #, php-format
 -msgid "Welcome back %s"
 -msgstr ""
 -
 -#: ../../mod/manage.php:87
 -msgid "Manage Identities and/or Pages"
 +msgid "Image size reduction [%s] failed."
  msgstr ""
  
 -#: ../../mod/manage.php:90
 -msgid ""
 -"(Toggle between different identities or community/group pages which share "
 -"your account details.)"
 +#: ../../mod/profile_photo.php:95
 +msgid "Unable to process image"
  msgstr ""
  
 -#: ../../mod/manage.php:92
 -msgid "Select an identity to manage: "
 +#: ../../mod/profile_photo.php:228
 +msgid "Image uploaded successfully."
  msgstr ""
  
 -#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
 +#: ../../mod/home.php:23
  #, php-format
 -msgid "%s welcomes %s"
 -msgstr ""
 -
 -#: ../../mod/dfrn_confirm.php:114 ../../mod/contacts.php:214
 -msgid "Contact not found."
 -msgstr ""
 -
 -#: ../../mod/dfrn_confirm.php:231
 -msgid "Response from remote site was not understood."
 +msgid "Welcome to %s"
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:240
 -msgid "Unexpected response from remote site: "
 +#: ../../mod/regmod.php:10
 +msgid "Please login."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:248
 -msgid "Confirmation completed successfully."
 +#: ../../mod/regmod.php:54
 +#, php-format
 +msgid "Registration revoked for %s"
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
 -#: ../../mod/dfrn_confirm.php:271
 -msgid "Remote site reported: "
 +#: ../../mod/regmod.php:92 ../../mod/register.php:310
 +#, php-format
 +msgid "Registration details for %s"
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:262
 -msgid "Temporary failure. Please wait and try again."
 +#: ../../mod/regmod.php:96
 +msgid "Account approved."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:269
 -msgid "Introduction failed or was revoked."
 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
 +#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
 +msgid "Profile not found."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:387
 -msgid "Unable to set contact photo."
 +#: ../../mod/profiles.php:28
 +msgid "Profile Name is required."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:426
 -msgid "is now friends with"
 +#: ../../mod/profiles.php:199
 +msgid "Profile updated."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:494
 -#, php-format
 -msgid "No user record found for '%s' "
 +#: ../../mod/profiles.php:254
 +msgid "Profile deleted."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:504
 -msgid "Our site encryption key is apparently messed up."
 +#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
 +msgid "Profile-"
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:515
 -msgid "Empty site URL was provided or URL could not be decrypted by us."
 +#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
 +msgid "New profile created."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:527
 -msgid "Contact record was not found for you on our site."
 +#: ../../mod/profiles.php:307
 +msgid "Profile unavailable to clone."
  msgstr ""
  
 -#: ../../mod/dfrn_confirm.php:555
 +#: ../../mod/profiles.php:370
  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
 -msgid "Unable to set your contact credentials on our system."
 -msgstr ""
 -
 -#: ../../mod/dfrn_confirm.php:619
 -msgid "Unable to update your contact profile details on our system"
 -msgstr ""
 -
 -#: ../../mod/dfrn_confirm.php:648
 -#, php-format
 -msgid "Connection accepted at %s"
 -msgstr ""
 -
 -#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
 -#, php-format
 -msgid "Image exceeds size limit of %d"
 +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 +"be visible to anybody using the internet."
  msgstr ""
  
 -#: ../../mod/wall_upload.php:65 ../../mod/photos.php:571
 -#: ../../mod/profile_photo.php:118
 -msgid "Unable to process image."
 +#: ../../mod/profiles.php:380
 +msgid "Age: "
  msgstr ""
  
 -#: ../../mod/wall_upload.php:82 ../../mod/photos.php:589
 -#: ../../mod/profile_photo.php:230
 -msgid "Image upload failed."
 +#: ../../mod/profiles.php:422
 +msgid "Profile Image"
  msgstr ""
  
 -#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
 -msgid "Item not found."
 +#: ../../mod/settings.php:37
 +msgid "Passwords do not match. Password unchanged."
  msgstr ""
  
 -#: ../../mod/display.php:305
 -msgid "Item has been removed."
 +#: ../../mod/settings.php:42
 +msgid "Empty passwords are not allowed. Password unchanged."
  msgstr ""
  
 -#: ../../mod/match.php:10
 -msgid "Profile Match"
 +#: ../../mod/settings.php:53
 +msgid "Password changed."
  msgstr ""
  
 -#: ../../mod/match.php:49
 -msgid "No matches"
 +#: ../../mod/settings.php:55
 +msgid "Password update failed. Please try again."
  msgstr ""
  
- #: ../../mod/settings.php:96
 -#: ../../mod/lockview.php:39
 -msgid "Remote privacy information not available."
++#: ../../mod/settings.php:97
 +msgid " Please use a shorter name."
  msgstr ""
  
- #: ../../mod/settings.php:98
 -#: ../../mod/lockview.php:43
 -msgid "Visible to:"
++#: ../../mod/settings.php:99
 +msgid " Name too short."
  msgstr ""
  
- #: ../../mod/settings.php:104
 -#: ../../mod/dfrn_notify.php:179
 -msgid "noreply"
++#: ../../mod/settings.php:105
 +msgid " Not valid email."
  msgstr ""
  
- #: ../../mod/settings.php:106
 -#: ../../mod/dfrn_notify.php:237
 -msgid "New mail received at "
++#: ../../mod/settings.php:107
 +msgid " Cannot change to that email."
  msgstr ""
  
- #: ../../mod/settings.php:163
 -#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
 -#, php-format
 -msgid "%s commented on an item at %s"
++#: ../../mod/settings.php:165
 +msgid "Settings updated."
  msgstr ""
  
- #: ../../mod/settings.php:213
 -#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
 -msgid "Remove My Account"
++#: ../../mod/settings.php:215
 +msgid "Plugin Settings"
  msgstr ""
  
- #: ../../mod/settings.php:214
 -#: ../../mod/removeme.php:43
 -msgid ""
 -"This will completely remove your account. Once this has been done it is not "
 -"recoverable."
++#: ../../mod/settings.php:216
 +msgid "Account Settings"
  msgstr ""
  
- #: ../../mod/settings.php:220
 -#: ../../mod/removeme.php:44
 -msgid "Please enter your password for verification:"
++#: ../../mod/settings.php:222
 +msgid "No Plugin settings configured"
  msgstr ""
  
- #: ../../mod/settings.php:266
 -#: ../../mod/home.php:23
 -#, php-format
 -msgid "Welcome to %s"
++#: ../../mod/settings.php:269
 +msgid "OpenID: "
  msgstr ""
  
- #: ../../mod/settings.php:266
 -#: ../../mod/regmod.php:10
 -msgid "Please login."
++#: ../../mod/settings.php:269
 +msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
  msgstr ""
  
- #: ../../mod/settings.php:298
 -#: ../../mod/regmod.php:54
 -#, php-format
 -msgid "Registration revoked for %s"
++#: ../../mod/settings.php:301
 +msgid "Profile is <strong>not published</strong>."
  msgstr ""
  
- #: ../../mod/settings.php:355
 -#: ../../mod/regmod.php:92 ../../mod/register.php:310
 -#, php-format
 -msgid "Registration details for %s"
++#: ../../mod/settings.php:358
 +msgid "Default Post Permissions"
  msgstr ""
  
 -#: ../../mod/regmod.php:96
 -msgid "Account approved."
 +#: ../../mod/search.php:54
 +msgid "No results."
  msgstr ""
  
- #: ../../mod/search.php:131 ../../mod/network.php:290
 -#: ../../mod/apps.php:6
 -msgid "Applications"
++#: ../../mod/search.php:131 ../../mod/network.php:295
 +msgid "View in context"
  msgstr ""
  
  #: ../../mod/photos.php:30
@@@ -668,6 -774,15 +701,6 @@@ msgstr "
  msgid "Contact information unavailable"
  msgstr ""
  
 -#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
 -#: ../../mod/photos.php:865 ../../mod/profile_photo.php:58
 -#: ../../mod/profile_photo.php:65 ../../mod/profile_photo.php:72
 -#: ../../mod/profile_photo.php:155 ../../mod/profile_photo.php:225
 -#: ../../mod/profile_photo.php:234 ../../mod/register.php:267
 -#: ../../mod/register.php:274 ../../mod/register.php:281
 -msgid "Profile Photos"
 -msgstr ""
 -
  #: ../../mod/photos.php:116
  msgid "Album not found."
  msgstr ""
@@@ -784,28 -899,32 +817,28 @@@ msgstr "
  msgid "View Album"
  msgstr ""
  
 -#: ../../mod/profile.php:8 ../../boot.php:2210
 -msgid "No profile"
 -msgstr ""
 -
 -#: ../../mod/profile.php:102
 -msgid "Status"
 +#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
 +msgid "Item not found."
  msgstr ""
  
- #: ../../mod/display.php:263 ../../mod/network.php:442
 -#: ../../mod/profile.php:103
 -msgid "Profile"
++#: ../../mod/display.php:263 ../../mod/network.php:447
 +msgid "View $owner_name's profile"
  msgstr ""
  
- #: ../../mod/display.php:264 ../../mod/network.php:443
 -#: ../../mod/profile.php:104
 -msgid "Photos"
++#: ../../mod/display.php:264 ../../mod/network.php:448
 +msgid "to"
  msgstr ""
  
- #: ../../mod/display.php:265 ../../mod/network.php:444
 -#: ../../mod/viewcontacts.php:17 ../../boot.php:2038
 -msgid "View Contacts"
++#: ../../mod/display.php:265 ../../mod/network.php:449
 +msgid "Wall-to-Wall"
  msgstr ""
  
- #: ../../mod/display.php:266 ../../mod/network.php:445
 -#: ../../mod/viewcontacts.php:32
 -msgid "No contacts."
++#: ../../mod/display.php:266 ../../mod/network.php:450
 +msgid "via Wall-To-Wall:"
  msgstr ""
  
 -#: ../../mod/viewcontacts.php:44 ../../mod/contacts.php:376
 -msgid "Visit $username's profile"
 +#: ../../mod/display.php:305
 +msgid "Item has been removed."
  msgstr ""
  
  #: ../../mod/editpost.php:17 ../../mod/editpost.php:27
@@@ -816,229 -935,234 +849,241 @@@ msgstr "
  msgid "Edit post"
  msgstr ""
  
 -#: ../../mod/settings.php:37
 -msgid "Passwords do not match. Password unchanged."
 +#: ../../mod/invite.php:28
 +#, php-format
 +msgid "%s : Not a valid email address."
  msgstr ""
  
 -#: ../../mod/settings.php:42
 -msgid "Empty passwords are not allowed. Password unchanged."
 +#: ../../mod/invite.php:32
 +#, php-format
 +msgid "Please join my network on %s"
  msgstr ""
  
 -#: ../../mod/settings.php:53
 -msgid "Password changed."
 +#: ../../mod/invite.php:38
 +#, php-format
 +msgid "%s : Message delivery failed."
  msgstr ""
  
 -#: ../../mod/settings.php:55
 -msgid "Password update failed. Please try again."
 +#: ../../mod/invite.php:42
 +#, php-format
 +msgid "%d message sent."
 +msgid_plural "%d messages sent."
 +msgstr[0] ""
 +msgstr[1] ""
 +
 +#: ../../mod/invite.php:57
 +msgid "Send invitations"
  msgstr ""
  
 -#: ../../mod/settings.php:97
 -msgid " Please use a shorter name."
 +#: ../../mod/invite.php:58
 +msgid "Enter email addresses, one per line:"
  msgstr ""
  
- #: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316
 -#: ../../mod/settings.php:99
 -msgid " Name too short."
++#: ../../mod/invite.php:59 ../../mod/message.php:183 ../../mod/message.php:317
 +msgid "Your message:"
  msgstr ""
  
 -#: ../../mod/settings.php:105
 -msgid " Not valid email."
 +#: ../../mod/invite.php:60
 +#, php-format
 +msgid "Please join my social network on %s"
  msgstr ""
  
 -#: ../../mod/settings.php:107
 -msgid " Cannot change to that email."
 +#: ../../mod/invite.php:61
 +msgid "To accept this invitation, please visit:"
  msgstr ""
  
 -#: ../../mod/settings.php:165
 -msgid "Settings updated."
 +#: ../../mod/invite.php:62
 +msgid ""
 +"Once you have registered, please connect with me via my profile page at:"
  msgstr ""
  
 -#: ../../mod/settings.php:215
 -msgid "Plugin Settings"
 +#: ../../mod/contacts.php:12
 +msgid "Invite Friends"
  msgstr ""
  
- #: ../../mod/contacts.php:16
 -#: ../../mod/settings.php:216
 -msgid "Account Settings"
++#: ../../mod/contacts.php:15
++msgid "Find People With Shared Interests"
+ msgstr ""
+ 
 -#: ../../mod/settings.php:222
 -msgid "No Plugin settings configured"
++#: ../../mod/contacts.php:19
 +msgid "Connect/Follow"
  msgstr ""
  
- #: ../../mod/contacts.php:17
 -#: ../../mod/settings.php:269
 -msgid "OpenID: "
++#: ../../mod/contacts.php:20
 +msgid "Example: bob@example.com, http://example.com/barbara"
  msgstr ""
  
- #: ../../mod/contacts.php:18
 -#: ../../mod/settings.php:269
 -msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
++#: ../../mod/contacts.php:21
 +msgid "Follow"
  msgstr ""
  
- #: ../../mod/contacts.php:38 ../../mod/contacts.php:119
 -#: ../../mod/settings.php:301
 -msgid "Profile is <strong>not published</strong>."
++#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
 +msgid "Could not access contact record."
  msgstr ""
  
- #: ../../mod/contacts.php:52
 -#: ../../mod/settings.php:358
 -msgid "Default Post Permissions"
++#: ../../mod/contacts.php:57
 +msgid "Could not locate selected profile."
  msgstr ""
  
- #: ../../mod/contacts.php:83
 -#: ../../mod/item.php:37
 -msgid "Unable to locate original post."
++#: ../../mod/contacts.php:88
 +msgid "Contact updated."
  msgstr ""
  
- #: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402
 -#: ../../mod/item.php:126
 -msgid "Empty post discarded."
++#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
 +msgid "Failed to update contact record."
  msgstr ""
  
- #: ../../mod/contacts.php:141
 -#: ../../mod/item.php:474
 -#, php-format
 -msgid "%s commented on your item at %s"
++#: ../../mod/contacts.php:146
 +msgid "Contact has been blocked"
  msgstr ""
  
- #: ../../mod/contacts.php:141
 -#: ../../mod/item.php:497
 -#, php-format
 -msgid "%s posted on your profile wall at %s"
++#: ../../mod/contacts.php:146
 +msgid "Contact has been unblocked"
  msgstr ""
  
- #: ../../mod/contacts.php:155
 -#: ../../mod/item.php:523
 -msgid "System error. Post not saved."
++#: ../../mod/contacts.php:160
 +msgid "Contact has been ignored"
  msgstr ""
  
- #: ../../mod/contacts.php:155
 -#: ../../mod/item.php:541
 -#, php-format
 -msgid ""
 -"This message was sent to you by %s, a member of the Friendika social network."
++#: ../../mod/contacts.php:160
 +msgid "Contact has been unignored"
  msgstr ""
  
- #: ../../mod/contacts.php:176
 -#: ../../mod/item.php:543
 -msgid "You may visit them online at"
++#: ../../mod/contacts.php:181
 +msgid "stopped following"
  msgstr ""
  
- #: ../../mod/contacts.php:195
 -#: ../../mod/item.php:545
 -msgid ""
 -"Please contact the sender by replying to this post if you do not wish to "
 -"receive these messages."
++#: ../../mod/contacts.php:200
 +msgid "Contact has been removed."
  msgstr ""
  
- #: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114
 -#: ../../mod/item.php:547
 -#, php-format
 -msgid "%s posted an update."
++#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
 +msgid "Contact not found."
  msgstr ""
  
- #: ../../mod/contacts.php:223 ../../mod/contacts.php:344
 -#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2055
 -msgid "Search"
++#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
 +msgid "Mutual Friendship"
  msgstr ""
  
- #: ../../mod/contacts.php:227 ../../mod/contacts.php:348
 -#: ../../mod/search.php:54
 -msgid "No results."
++#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
 +msgid "is a fan of yours"
  msgstr ""
  
- #: ../../mod/contacts.php:232 ../../mod/contacts.php:352
 -#: ../../mod/profile_photo.php:28
 -msgid "Image uploaded but image cropping failed."
++#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
 +msgid "you are a fan of"
  msgstr ""
  
- #: ../../mod/contacts.php:248
 -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
 -#, php-format
 -msgid "Image size reduction [%s] failed."
++#: ../../mod/contacts.php:252
++msgid "Privacy Unavailable"
+ msgstr ""
+ 
 -#: ../../mod/profile_photo.php:95
 -msgid "Unable to process image"
++#: ../../mod/contacts.php:253
++msgid "Private communications are not available for this contact."
+ msgstr ""
+ 
 -#: ../../mod/profile_photo.php:228
 -msgid "Image uploaded successfully."
++#: ../../mod/contacts.php:256
 +msgid "Never"
  msgstr ""
  
- #: ../../mod/contacts.php:252
 -#: ../../mod/group.php:27
 -msgid "Group created."
++#: ../../mod/contacts.php:260
 +msgid "(Update was successful)"
  msgstr ""
  
- #: ../../mod/contacts.php:252
 -#: ../../mod/group.php:33
 -msgid "Could not create group."
++#: ../../mod/contacts.php:260
 +msgid "(Update was not successful)"
  msgstr ""
  
- #: ../../mod/contacts.php:255
 -#: ../../mod/group.php:43 ../../mod/group.php:123
 -msgid "Group not found."
++#: ../../mod/contacts.php:263
 +msgid "Contact Editor"
  msgstr ""
  
- #: ../../mod/contacts.php:256
 -#: ../../mod/group.php:56
 -msgid "Group name changed."
++#: ../../mod/contacts.php:264
 +msgid "Visit $name's profile"
  msgstr ""
  
- #: ../../mod/contacts.php:257
 -#: ../../mod/group.php:79
 -msgid "Membership list updated."
++#: ../../mod/contacts.php:265
 +msgid "Block/Unblock contact"
  msgstr ""
  
- #: ../../mod/contacts.php:258
 -#: ../../mod/group.php:88 ../../index.php:250
 -msgid "Permission denied"
++#: ../../mod/contacts.php:266
 +msgid "Ignore contact"
  msgstr ""
  
- #: ../../mod/contacts.php:259
 -#: ../../mod/group.php:107
 -msgid "Group removed."
++#: ../../mod/contacts.php:267
 +msgid "Delete contact"
  msgstr ""
  
- #: ../../mod/contacts.php:261
 -#: ../../mod/group.php:109
 -msgid "Unable to remove group."
++#: ../../mod/contacts.php:269
 +msgid "Last updated: "
  msgstr ""
  
- #: ../../mod/contacts.php:262
 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 -#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41
 -msgid "Cancel"
++#: ../../mod/contacts.php:270
 +msgid "Update public posts: "
  msgstr ""
  
- #: ../../mod/contacts.php:264
 -#: ../../mod/tagrm.php:41
 -msgid "Tag removed"
++#: ../../mod/contacts.php:272
 +msgid "Update now"
  msgstr ""
  
- #: ../../mod/contacts.php:267
 -#: ../../mod/tagrm.php:79
 -msgid "Remove Item Tag"
++#: ../../mod/contacts.php:275
 +msgid "Unblock this contact"
  msgstr ""
  
- #: ../../mod/contacts.php:267
 -#: ../../mod/tagrm.php:81
 -msgid "Select a tag to remove: "
++#: ../../mod/contacts.php:275
 +msgid "Block this contact"
  msgstr ""
  
- #: ../../mod/contacts.php:268
 -#: ../../mod/tagrm.php:93
 -msgid "Remove"
++#: ../../mod/contacts.php:276
 +msgid "Unignore this contact"
  msgstr ""
  
- #: ../../mod/contacts.php:268
 -#: ../../mod/invite.php:28
 -#, php-format
 -msgid "%s : Not a valid email address."
++#: ../../mod/contacts.php:276
 +msgid "Ignore this contact"
 +msgstr ""
 +
- #: ../../mod/contacts.php:271
++#: ../../mod/contacts.php:279
 +msgid "Currently blocked"
 +msgstr ""
 +
- #: ../../mod/contacts.php:272
++#: ../../mod/contacts.php:280
 +msgid "Currently ignored"
 +msgstr ""
 +
- #: ../../mod/contacts.php:303 ../../include/acl_selectors.php:140
++#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140
 +#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
 +msgid "Contacts"
  msgstr ""
  
- #: ../../mod/contacts.php:305
 -#: ../../mod/invite.php:32
 -#, php-format
 -msgid "Please join my network on %s"
++#: ../../mod/contacts.php:313
 +msgid "Show Blocked Connections"
  msgstr ""
  
- #: ../../mod/contacts.php:305
 -#: ../../mod/invite.php:38
 -#, php-format
 -msgid "%s : Message delivery failed."
++#: ../../mod/contacts.php:313
 +msgid "Hide Blocked Connections"
  msgstr ""
  
- #: ../../mod/contacts.php:307 ../../mod/directory.php:38
 -#: ../../mod/invite.php:42
 -#, php-format
 -msgid "%d message sent."
 -msgid_plural "%d messages sent."
 -msgstr[0] ""
 -msgstr[1] ""
++#: ../../mod/contacts.php:315 ../../mod/directory.php:38
 +msgid "Finding: "
 +msgstr ""
  
- #: ../../mod/contacts.php:308
 -#: ../../mod/invite.php:57
 -msgid "Send invitations"
++#: ../../mod/contacts.php:316
 +msgid "Find"
  msgstr ""
  
- #: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44
 -#: ../../mod/invite.php:58
 -msgid "Enter email addresses, one per line:"
++#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44
 +msgid "Visit $username's profile"
  msgstr ""
  
- #: ../../mod/contacts.php:369
 -#: ../../mod/invite.php:60
 -#, php-format
 -msgid "Please join my social network on %s"
++#: ../../mod/contacts.php:377
 +msgid "Edit contact"
  msgstr ""
  
 -#: ../../mod/invite.php:61
 -msgid "To accept this invitation, please visit:"
 +#: ../../mod/lockview.php:39
 +msgid "Remote privacy information not available."
  msgstr ""
  
 -#: ../../mod/invite.php:62
 -msgid ""
 -"Once you have registered, please connect with me via my profile page at:"
 +#: ../../mod/lockview.php:43
 +msgid "Visible to:"
  msgstr ""
  
  #: ../../mod/register.php:47
@@@ -1168,216 -1292,49 +1213,224 @@@ msgstr "
  msgid "Choose a nickname: "
  msgstr ""
  
- #: ../../mod/install.php:30
 -#: ../../mod/register.php:445 ../../include/nav.php:61 ../../boot.php:809
 -msgid "Register"
++#: ../../mod/install.php:33
 +msgid "Could not create/connect to database."
  msgstr ""
  
- #: ../../mod/install.php:35
 -#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
 -#: ../../include/auth.php:130 ../../include/auth.php:183
 -msgid "Login failed."
++#: ../../mod/install.php:38
 +msgid "Connected to database."
  msgstr ""
  
- #: ../../mod/install.php:66
- msgid "Database import succeeded."
 -#: ../../mod/openid.php:73 ../../include/auth.php:194
 -msgid "Welcome back "
++#: ../../mod/install.php:72
++msgid "Proceed with Installation"
+ msgstr ""
+ 
 -#: ../../mod/like.php:110
 -msgid "status"
++#: ../../mod/install.php:74
++msgid "Your Friendika site database has been installed."
  msgstr ""
  
- #: ../../mod/install.php:67
 -#: ../../mod/like.php:127
 -#, php-format
 -msgid "%1$s likes %2$s's %3$s"
++#: ../../mod/install.php:75
 +msgid ""
 +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
  msgstr ""
  
- #: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175
 -#: ../../mod/like.php:129
 -#, php-format
 -msgid "%1$s doesn't like %2$s's %3$s"
++#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
 +msgid "Please see the file \"INSTALL.txt\"."
  msgstr ""
  
- #: ../../mod/install.php:73
 -#: ../../mod/follow.php:173
 -msgid "The profile address specified does not provide adequate information."
++#: ../../mod/install.php:78
++msgid "Proceed to registration"
+ msgstr ""
+ 
 -#: ../../mod/follow.php:179
++#: ../../mod/install.php:84
 +msgid "Database import failed."
 +msgstr ""
 +
- #: ../../mod/install.php:74
++#: ../../mod/install.php:85
  msgid ""
 -"Limited profile. This person will be unable to receive direct/personal "
 -"notifications from you."
 +"You may need to import the file \"database.sql\" manually using phpmyadmin "
 +"or mysql."
  msgstr ""
  
- #: ../../mod/install.php:84
 -#: ../../mod/follow.php:230
 -msgid "Unable to retrieve contact information."
++#: ../../mod/install.php:98
 +msgid "Welcome to Friendika."
 +msgstr ""
 +
- #: ../../mod/install.php:124
++#: ../../mod/install.php:138
 +msgid "Could not find a command line version of PHP in the web server PATH."
 +msgstr ""
 +
- #: ../../mod/install.php:125
++#: ../../mod/install.php:139
 +msgid ""
 +"This is required. Please adjust the configuration file .htconfig.php "
 +"accordingly."
 +msgstr ""
 +
- #: ../../mod/install.php:132
++#: ../../mod/install.php:146
 +msgid ""
 +"The command line version of PHP on your system does not have "
 +"\"register_argc_argv\" enabled."
 +msgstr ""
 +
- #: ../../mod/install.php:133
++#: ../../mod/install.php:147
 +msgid "This is required for message delivery to work."
 +msgstr ""
 +
- #: ../../mod/install.php:155
++#: ../../mod/install.php:169
 +msgid ""
 +"Error: the \"openssl_pkey_new\" function on this system is not able to "
 +"generate encryption keys"
 +msgstr ""
 +
- #: ../../mod/install.php:156
++#: ../../mod/install.php:170
 +msgid ""
 +"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 +"installation.php\"."
 +msgstr ""
 +
- #: ../../mod/install.php:165
++#: ../../mod/install.php:179
 +msgid ""
 +"Error: Apache webserver mod-rewrite module is required but not installed."
 +msgstr ""
 +
- #: ../../mod/install.php:167
++#: ../../mod/install.php:181
 +msgid "Error: libCURL PHP module required but not installed."
 +msgstr ""
 +
- #: ../../mod/install.php:169
++#: ../../mod/install.php:183
 +msgid ""
 +"Error: GD graphics PHP module with JPEG support required but not installed."
 +msgstr ""
 +
- #: ../../mod/install.php:171
++#: ../../mod/install.php:185
 +msgid "Error: openssl PHP module required but not installed."
 +msgstr ""
 +
- #: ../../mod/install.php:173
++#: ../../mod/install.php:187
 +msgid "Error: mysqli PHP module required but not installed."
 +msgstr ""
 +
- #: ../../mod/install.php:184
++#: ../../mod/install.php:198
 +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:185
++#: ../../mod/install.php:199
 +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:186
++#: ../../mod/install.php:200
 +msgid ""
 +"Please check with your site documentation or support people to see if this "
 +"situation can be corrected."
 +msgstr ""
 +
- #: ../../mod/install.php:187
++#: ../../mod/install.php:201
 +msgid ""
 +"If not, you may be required to perform a manual installation. Please see the "
 +"file \"INSTALL.txt\" for instructions."
 +msgstr ""
 +
- #: ../../mod/install.php:196
++#: ../../mod/install.php:210
 +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:211
++#: ../../mod/install.php:225
 +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:151
++#: ../../mod/network.php:156
 +msgid "No such group"
 +msgstr ""
 +
- #: ../../mod/network.php:162
++#: ../../mod/network.php:167
 +msgid "Group is empty"
 +msgstr ""
 +
- #: ../../mod/network.php:166
++#: ../../mod/network.php:171
 +msgid "Group: "
 +msgstr ""
 +
 +#: ../../mod/notifications.php:28
 +msgid "Invalid request identifier."
 +msgstr ""
 +
 +#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
 +msgid "Discard"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
 +msgid "Ignore"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:72
 +msgid "Show Ignored Requests"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:72
 +msgid "Hide Ignored Requests"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:105
 +msgid "Claims to be known to you: "
 +msgstr ""
 +
 +#: ../../mod/notifications.php:105
 +msgid "yes"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:105
 +msgid "no"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:111
 +msgid "Approve as: "
 +msgstr ""
 +
 +#: ../../mod/notifications.php:112
 +msgid "Friend"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:113
 +msgid "Fan/Admirer"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:120
 +msgid "Notification type: "
 +msgstr ""
 +
 +#: ../../mod/notifications.php:121
 +msgid "Friend/Connect Request"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:121
 +msgid "New Follower"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:131
 +msgid "Approve"
 +msgstr ""
 +
 +#: ../../mod/notifications.php:140
 +msgid "No notifications."
  msgstr ""
  
 -#: ../../mod/follow.php:276
 -msgid "following"
 +#: ../../mod/notifications.php:164
 +msgid "No registrations."
  msgstr ""
  
  #: ../../mod/dfrn_request.php:92
@@@ -1453,6 -1410,10 +1506,6 @@@ msgstr "
  msgid "Disallowed profile URL."
  msgstr ""
  
 -#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90
 -msgid "Failed to update contact record."
 -msgstr ""
 -
  #: ../../mod/dfrn_request.php:423
  msgid "Your introduction has been sent."
  msgstr ""
@@@ -1521,302 -1482,220 +1574,310 @@@ msgstr "
  msgid "Submit Request"
  msgstr ""
  
 -#: ../../mod/contacts.php:12
 -msgid "Invite Friends"
 +#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11
 +#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
 +msgid "Cancel"
  msgstr ""
  
 -#: ../../mod/contacts.php:15
 -msgid "Find People With Shared Interests"
 +#: ../../mod/like.php:110
 +msgid "status"
  msgstr ""
  
 -#: ../../mod/contacts.php:19
 -msgid "Connect/Follow"
 +#: ../../mod/like.php:127
 +#, php-format
 +msgid "%1$s likes %2$s's %3$s"
  msgstr ""
  
 -#: ../../mod/contacts.php:20
 -msgid "Example: bob@example.com, http://example.com/barbara"
 +#: ../../mod/like.php:129
 +#, php-format
 +msgid "%1$s doesn't like %2$s's %3$s"
  msgstr ""
  
 -#: ../../mod/contacts.php:21
 -msgid "Follow"
 +#: ../../mod/lostpass.php:38
 +#, php-format
 +msgid "Password reset requested at %s"
  msgstr ""
  
 -#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
 -msgid "Could not access contact record."
 +#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
 +msgid "Remove My Account"
  msgstr ""
  
 -#: ../../mod/contacts.php:57
 -msgid "Could not locate selected profile."
 +#: ../../mod/removeme.php:43
 +msgid ""
 +"This will completely remove your account. Once this has been done it is not "
 +"recoverable."
  msgstr ""
  
 -#: ../../mod/contacts.php:88
 -msgid "Contact updated."
 +#: ../../mod/removeme.php:44
 +msgid "Please enter your password for verification:"
  msgstr ""
  
 -#: ../../mod/contacts.php:146
 -msgid "Contact has been blocked"
 +#: ../../mod/apps.php:6
 +msgid "Applications"
  msgstr ""
  
 -#: ../../mod/contacts.php:146
 -msgid "Contact has been unblocked"
 +#: ../../mod/directory.php:32
 +msgid "Global Directory"
  msgstr ""
  
 -#: ../../mod/contacts.php:160
 -msgid "Contact has been ignored"
 +#: ../../mod/item.php:37
 +msgid "Unable to locate original post."
  msgstr ""
  
 -#: ../../mod/contacts.php:160
 -msgid "Contact has been unignored"
 +#: ../../mod/item.php:126
 +msgid "Empty post discarded."
  msgstr ""
  
 -#: ../../mod/contacts.php:181
 -msgid "stopped following"
 +#: ../../mod/item.php:474
 +#, php-format
 +msgid "%s commented on your item at %s"
  msgstr ""
  
 -#: ../../mod/contacts.php:200
 -msgid "Contact has been removed."
 +#: ../../mod/item.php:497
 +#, php-format
 +msgid "%s posted on your profile wall at %s"
  msgstr ""
  
 -#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
 -msgid "Mutual Friendship"
 +#: ../../mod/item.php:523
 +msgid "System error. Post not saved."
  msgstr ""
  
 -#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
 -msgid "is a fan of yours"
 +#: ../../mod/item.php:541
 +#, php-format
 +msgid ""
 +"This message was sent to you by %s, a member of the Friendika social network."
  msgstr ""
  
 -#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
 -msgid "you are a fan of"
 +#: ../../mod/item.php:543
 +msgid "You may visit them online at"
  msgstr ""
  
 -#: ../../mod/contacts.php:252
 -msgid "Privacy Unavailable"
 +#: ../../mod/item.php:545
 +msgid ""
 +"Please contact the sender by replying to this post if you do not wish to "
 +"receive these messages."
  msgstr ""
  
 -#: ../../mod/contacts.php:253
 -msgid "Private communications are not available for this contact."
 +#: ../../mod/item.php:547
 +#, php-format
 +msgid "%s posted an update."
  msgstr ""
  
 -#: ../../mod/contacts.php:256
 -msgid "Never"
 +#: ../../mod/tagrm.php:41
 +msgid "Tag removed"
  msgstr ""
  
 -#: ../../mod/contacts.php:260
 -msgid "(Update was successful)"
 +#: ../../mod/tagrm.php:79
 +msgid "Remove Item Tag"
  msgstr ""
  
 -#: ../../mod/contacts.php:260
 -msgid "(Update was not successful)"
 +#: ../../mod/tagrm.php:81
 +msgid "Select a tag to remove: "
  msgstr ""
  
 -#: ../../mod/contacts.php:263
 -msgid "Contact Editor"
 +#: ../../mod/tagrm.php:93
 +msgid "Remove"
  msgstr ""
  
 -#: ../../mod/contacts.php:264
 -msgid "Visit $name's profile"
 +#: ../../mod/message.php:18
 +msgid "No recipient selected."
  msgstr ""
  
 -#: ../../mod/contacts.php:265
 -msgid "Block/Unblock contact"
 +#: ../../mod/message.php:23
 +msgid "[no subject]"
  msgstr ""
  
 -#: ../../mod/contacts.php:266
 -msgid "Ignore contact"
 +#: ../../mod/message.php:34
 +msgid "Unable to locate contact information."
  msgstr ""
  
 -#: ../../mod/contacts.php:267
 -msgid "Delete contact"
 +#: ../../mod/message.php:102
 +msgid "Message sent."
  msgstr ""
  
 -#: ../../mod/contacts.php:269
 -msgid "Last updated: "
 +#: ../../mod/message.php:105
 +msgid "Message could not be sent."
  msgstr ""
  
 -#: ../../mod/contacts.php:270
 -msgid "Update public posts: "
 +#: ../../mod/message.php:125 ../../include/nav.php:100
 +msgid "Messages"
  msgstr ""
  
 -#: ../../mod/contacts.php:272
 -msgid "Update now"
 +#: ../../mod/message.php:126
 +msgid "Inbox"
  msgstr ""
  
 -#: ../../mod/contacts.php:275
 -msgid "Unblock this contact"
 +#: ../../mod/message.php:127
 +msgid "Outbox"
  msgstr ""
  
 -#: ../../mod/contacts.php:275
 -msgid "Block this contact"
 +#: ../../mod/message.php:128
 +msgid "New Message"
  msgstr ""
  
 -#: ../../mod/contacts.php:276
 -msgid "Unignore this contact"
 +#: ../../mod/message.php:142
 +msgid "Message deleted."
  msgstr ""
  
 -#: ../../mod/contacts.php:276
 -msgid "Ignore this contact"
 +#: ../../mod/message.php:158
 +msgid "Conversation removed."
  msgstr ""
  
- #: ../../mod/message.php:177
 -#: ../../mod/contacts.php:279
 -msgid "Currently blocked"
++#: ../../mod/message.php:178
 +msgid "Send Private Message"
  msgstr ""
  
- #: ../../mod/message.php:178 ../../mod/message.php:312
 -#: ../../mod/contacts.php:280
 -msgid "Currently ignored"
++#: ../../mod/message.php:179 ../../mod/message.php:313
 +msgid "To:"
  msgstr ""
  
- #: ../../mod/message.php:179 ../../mod/message.php:313
 -#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140
 -#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
 -#: ../../boot.php:2022
 -msgid "Contacts"
++#: ../../mod/message.php:180 ../../mod/message.php:314
 +msgid "Subject:"
  msgstr ""
  
- #: ../../mod/message.php:221
 -#: ../../mod/contacts.php:313
 -msgid "Show Blocked Connections"
++#: ../../mod/message.php:222
 +msgid "No messages."
  msgstr ""
  
- #: ../../mod/message.php:234
 -#: ../../mod/contacts.php:313
 -msgid "Hide Blocked Connections"
++#: ../../mod/message.php:235
 +msgid "Delete conversation"
  msgstr ""
  
- #: ../../mod/message.php:264
 -#: ../../mod/contacts.php:316
 -msgid "Find"
++#: ../../mod/message.php:265
 +msgid "Message not available."
 +msgstr ""
 +
- #: ../../mod/message.php:301
++#: ../../mod/message.php:302
 +msgid "Delete message"
 +msgstr ""
 +
- #: ../../mod/message.php:311
++#: ../../mod/message.php:312
 +msgid "Send Reply"
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:231
 +msgid "Response from remote site was not understood."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:240
 +msgid "Unexpected response from remote site: "
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:248
 +msgid "Confirmation completed successfully."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
 +#: ../../mod/dfrn_confirm.php:271
 +msgid "Remote site reported: "
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:262
 +msgid "Temporary failure. Please wait and try again."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:269
 +msgid "Introduction failed or was revoked."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:387
 +msgid "Unable to set contact photo."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:426
 +msgid "is now friends with"
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:494
 +#, php-format
 +msgid "No user record found for '%s' "
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:504
 +msgid "Our site encryption key is apparently messed up."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:515
 +msgid "Empty site URL was provided or URL could not be decrypted by us."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:527
 +msgid "Contact record was not found for you on our site."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:555
 +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
 +msgid "Unable to set your contact credentials on our system."
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:619
 +msgid "Unable to update your contact profile details on our system"
 +msgstr ""
 +
 +#: ../../mod/dfrn_confirm.php:648
 +#, php-format
 +msgid "Connection accepted at %s"
  msgstr ""
  
 -#: ../../mod/contacts.php:377
 -msgid "Edit contact"
 +#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
 +#: ../../include/auth.php:130 ../../include/auth.php:183
 +msgid "Login failed."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:116
 -msgid "Facebook disabled"
 +#: ../../mod/openid.php:73 ../../include/auth.php:194
 +msgid "Welcome back "
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:124
 -msgid "Facebook API key is missing."
 +#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
 +#, php-format
 +msgid "%s welcomes %s"
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:131
 -msgid "Facebook Connect"
 +#: ../../mod/viewcontacts.php:32
 +msgid "No contacts."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:137
 -msgid "Install Facebook post connector"
 +#: ../../mod/group.php:27
 +msgid "Group created."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:144
 -msgid "Remove Facebook post connector"
 +#: ../../mod/group.php:33
 +msgid "Could not create group."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:150
 -msgid "Post to Facebook by default"
 +#: ../../mod/group.php:43 ../../mod/group.php:123
 +msgid "Group not found."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:174
 -msgid "Facebook"
 +#: ../../mod/group.php:56
 +msgid "Group name changed."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:175
 -msgid "Facebook Connector Settings"
 +#: ../../mod/group.php:79
 +msgid "Membership list updated."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:189
 -msgid "Post to Facebook"
 +#: ../../mod/group.php:107
 +msgid "Group removed."
  msgstr ""
  
 -#: ../../addon/facebook/facebook.php:230
 -msgid "Image: "
 +#: ../../mod/group.php:109
 +msgid "Unable to remove group."
  msgstr ""
  
 -#: ../../addon/randplace/randplace.php:171
 -msgid "Randplace Settings"
++#: ../../mod/match.php:10
++msgid "Profile Match"
+ msgstr ""
+ 
 -#: ../../addon/randplace/randplace.php:173
 -msgid "Enable Randplace Plugin"
++#: ../../mod/match.php:49
++msgid "No matches"
+ msgstr ""
+ 
  #: ../../addon/twitter/twitter.php:64
  msgid "Post to Twitter"
  msgstr ""
@@@ -1866,6 -1745,101 +1927,6 @@@ msgstr "
  msgid "Clear OAuth configuration"
  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"
 -msgstr ""
 -
 -#: ../../addon/tictac/tictac.php:53
 -msgid "New game with handicap"
 -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. "
 -msgstr ""
 -
 -#: ../../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 ""
 -
 -#: ../../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/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!"
 -msgstr ""
 -
 -#: ../../addon/tictac/tictac.php:216
 -msgid "I won!"
 -msgstr ""
 -
 -#: ../../addon/js_upload/js_upload.php:39
 -msgid "Upload a file"
 -msgstr ""
 -
 -#: ../../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/java_upload/java_upload.php:33
 -msgid "Select files to upload: "
 -msgstr ""
 -
 -#: ../../addon/java_upload/java_upload.php:35
 -msgid ""
 -"Use the following controls only if the Java uploader [above] fails to launch."
 -msgstr ""
 -
  #: ../../addon/statusnet/statusnet.php:78
  msgid "Post to StatusNet"
  msgstr ""
@@@ -1908,160 -1882,253 +1969,160 @@@ msgid "Log in with StatusNet
  msgstr ""
  
  #: ../../addon/statusnet/statusnet.php:184
 -msgid "Copy the security code from StatusNet here"
 -msgstr ""
 -
 -#: ../../addon/statusnet/statusnet.php:198
 -msgid ""
 -"If enabled all your <strong>public</strong> postings will be posted to the "
 -"associated StatusNet account as well."
 -msgstr ""
 -
 -#: ../../addon/statusnet/statusnet.php:200
 -msgid "Send public postings to StatusNet"
 -msgstr ""
 -
 -#: ../../index.php:194
 -msgid "Not Found"
 -msgstr ""
 -
 -#: ../../index.php:195
 -msgid "Page not found."
 -msgstr ""
 -
 -#: ../../include/acl_selectors.php:132
 -msgid "Visible To:"
 -msgstr ""
 -
 -#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
 -msgid "Groups"
 -msgstr ""
 -
 -#: ../../include/acl_selectors.php:147
 -msgid "Except For:"
 -msgstr ""
 -
 -#: ../../include/auth.php:27
 -msgid "Logged out."
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Male"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Female"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Currently Male"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Currently Female"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Mostly Male"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Mostly Female"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Transgender"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Intersex"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Transsexual"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Hermaphrodite"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Neuter"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Non-specific"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Other"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:6
 -msgid "Undecided"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:19
 -msgid "Males"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:19
 -msgid "Females"
 -msgstr ""
 -
 -#: ../../include/profile_selectors.php:19
 -msgid "Gay"
 +msgid "Copy the security code from StatusNet here"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Lesbian"
 +#: ../../addon/statusnet/statusnet.php:198
 +msgid ""
 +"If enabled all your <strong>public</strong> postings will be posted to the "
 +"associated StatusNet account as well."
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "No Preference"
 +#: ../../addon/statusnet/statusnet.php:200
 +msgid "Send public postings to StatusNet"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Bisexual"
 +#: ../../addon/tictac/tictac.php:14
 +msgid "Three Dimensional Tic-Tac-Toe"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Autosexual"
 +#: ../../addon/tictac/tictac.php:47
 +msgid "3D Tic-Tac-Toe"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Abstinent"
 +#: ../../addon/tictac/tictac.php:52
 +msgid "New game"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Virgin"
 +#: ../../addon/tictac/tictac.php:53
 +msgid "New game with handicap"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Deviant"
 +#: ../../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 ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Fetish"
 +#: ../../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 ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Oodles"
 +#: ../../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 ""
  
 -#: ../../include/profile_selectors.php:19
 -msgid "Nonsexual"
 +#: ../../addon/tictac/tictac.php:176
 +msgid "You go first..."
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Single"
 +#: ../../addon/tictac/tictac.php:181
 +msgid "I'm going first this time..."
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Lonely"
 +#: ../../addon/tictac/tictac.php:187
 +msgid "You won!"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Available"
 +#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
 +msgid "\"Cat\" game!"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Unavailable"
 +#: ../../addon/tictac/tictac.php:216
 +msgid "I won!"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Dating"
 +#: ../../addon/java_upload/java_upload.php:33
 +msgid "Select files to upload: "
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Unfaithful"
 +#: ../../addon/java_upload/java_upload.php:35
 +msgid ""
 +"Use the following controls only if the Java uploader [above] fails to launch."
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Sex Addict"
 +#: ../../addon/facebook/facebook.php:116
 +msgid "Facebook disabled"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Friends"
 +#: ../../addon/facebook/facebook.php:124
 +msgid "Facebook API key is missing."
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Friends/Benefits"
 +#: ../../addon/facebook/facebook.php:131
 +msgid "Facebook Connect"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Casual"
 +#: ../../addon/facebook/facebook.php:137
 +msgid "Install Facebook post connector"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Engaged"
 +#: ../../addon/facebook/facebook.php:144
 +msgid "Remove Facebook post connector"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Married"
 +#: ../../addon/facebook/facebook.php:150
 +msgid "Post to Facebook by default"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Partners"
 +#: ../../addon/facebook/facebook.php:174
 +msgid "Facebook"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Cohabiting"
 +#: ../../addon/facebook/facebook.php:175
 +msgid "Facebook Connector Settings"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Happy"
 +#: ../../addon/facebook/facebook.php:189
 +msgid "Post to Facebook"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Not Looking"
 +#: ../../addon/facebook/facebook.php:230
 +msgid "Image: "
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Swinger"
 +#: ../../addon/randplace/randplace.php:171
 +msgid "Randplace Settings"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Betrayed"
 +#: ../../addon/randplace/randplace.php:173
 +msgid "Enable Randplace Plugin"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Separated"
 +#: ../../addon/js_upload/js_upload.php:39
 +msgid "Upload a file"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Unstable"
 +#: ../../addon/js_upload/js_upload.php:40
 +msgid "Drop files here to upload"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Divorced"
 +#: ../../addon/js_upload/js_upload.php:42
 +msgid "Failed"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Widowed"
 +#: ../../addon/js_upload/js_upload.php:288
 +msgid "No files were uploaded."
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Uncertain"
 +#: ../../addon/js_upload/js_upload.php:294
 +msgid "Uploaded file is empty"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Complicated"
 +#: ../../addon/js_upload/js_upload.php:299
 +msgid "Uploaded file is too large"
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Don't care"
 +#: ../../addon/js_upload/js_upload.php:317
 +msgid "File has an invalid extension, it should be one of "
  msgstr ""
  
 -#: ../../include/profile_selectors.php:33
 -msgid "Ask me"
 +#: ../../addon/js_upload/js_upload.php:328
 +msgid "Upload was cancelled, or server error encountered"
  msgstr ""
  
  #: ../../include/contact_selectors.php:32
@@@ -2112,355 -2179,342 +2173,355 @@@ msgstr "
  msgid "Monthly"
  msgstr ""
  
 -#: ../../include/nav.php:38 ../../boot.php:837
 -msgid "Logout"
 +#: ../../include/profile_selectors.php:6
 +msgid "Male"
  msgstr ""
  
 -#: ../../include/nav.php:44 ../../boot.php:817 ../../boot.php:823
 -msgid "Login"
 +#: ../../include/profile_selectors.php:6
 +msgid "Female"
  msgstr ""
  
 -#: ../../include/nav.php:56 ../../include/nav.php:91
 -msgid "Home"
 +#: ../../include/profile_selectors.php:6
 +msgid "Currently Male"
  msgstr ""
  
 -#: ../../include/nav.php:64
 -msgid "Apps"
 +#: ../../include/profile_selectors.php:6
 +msgid "Currently Female"
  msgstr ""
  
 -#: ../../include/nav.php:77
 -msgid "Directory"
 +#: ../../include/profile_selectors.php:6
 +msgid "Mostly Male"
  msgstr ""
  
 -#: ../../include/nav.php:87
 -msgid "Network"
 +#: ../../include/profile_selectors.php:6
 +msgid "Mostly Female"
  msgstr ""
  
 -#: ../../include/nav.php:96
 -msgid "Notifications"
 +#: ../../include/profile_selectors.php:6
 +msgid "Transgender"
  msgstr ""
  
 -#: ../../include/nav.php:104
 -msgid "Manage"
 +#: ../../include/profile_selectors.php:6
 +msgid "Intersex"
  msgstr ""
  
 -#: ../../include/nav.php:107
 -msgid "Settings"
 +#: ../../include/profile_selectors.php:6
 +msgid "Transsexual"
  msgstr ""
  
 -#: ../../include/nav.php:109
 -msgid "Profiles"
 +#: ../../include/profile_selectors.php:6
 +msgid "Hermaphrodite"
  msgstr ""
  
 -#: ../../include/oembed.php:57
 -msgid "Embedding disabled"
 +#: ../../include/profile_selectors.php:6
 +msgid "Neuter"
  msgstr ""
  
 -#: ../../include/items.php:1027
 -msgid "Birthday:"
 +#: ../../include/profile_selectors.php:6
 +msgid "Non-specific"
  msgstr ""
  
 -#: ../../include/items.php:1371
 -msgid "You have a new follower at "
 +#: ../../include/profile_selectors.php:6
 +msgid "Other"
  msgstr ""
  
 -#: ../../include/group.php:130
 -msgid "Create a new group"
 +#: ../../include/profile_selectors.php:6
 +msgid "Undecided"
  msgstr ""
  
 -#: ../../include/group.php:131
 -msgid "Everybody"
 +#: ../../include/profile_selectors.php:19
 +msgid "Males"
  msgstr ""
  
 -#: ../../include/datetime.php:44 ../../include/datetime.php:46
 -msgid "Miscellaneous"
 +#: ../../include/profile_selectors.php:19
 +msgid "Females"
  msgstr ""
  
 -#: ../../include/datetime.php:148
 -msgid "less than a second ago"
 +#: ../../include/profile_selectors.php:19
 +msgid "Gay"
  msgstr ""
  
 -#: ../../include/datetime.php:151
 -msgid "year"
 +#: ../../include/profile_selectors.php:19
 +msgid "Lesbian"
  msgstr ""
  
 -#: ../../include/datetime.php:151
 -msgid "years"
 +#: ../../include/profile_selectors.php:19
 +msgid "No Preference"
  msgstr ""
  
 -#: ../../include/datetime.php:152
 -msgid "month"
 +#: ../../include/profile_selectors.php:19
 +msgid "Bisexual"
  msgstr ""
  
 -#: ../../include/datetime.php:152
 -msgid "months"
 +#: ../../include/profile_selectors.php:19
 +msgid "Autosexual"
 +msgstr ""
 +
 +#: ../../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/datetime.php:153
 -msgid "week"
 +#: ../../include/profile_selectors.php:19
 +msgid "Nonsexual"
  msgstr ""
  
 -#: ../../include/datetime.php:153
 -msgid "weeks"
 +#: ../../include/profile_selectors.php:33
 +msgid "Single"
  msgstr ""
  
 -#: ../../include/datetime.php:154
 -msgid "day"
 +#: ../../include/profile_selectors.php:33
 +msgid "Lonely"
  msgstr ""
  
 -#: ../../include/datetime.php:154
 -msgid "days"
 +#: ../../include/profile_selectors.php:33
 +msgid "Available"
  msgstr ""
  
 -#: ../../include/datetime.php:155
 -msgid "hour"
 +#: ../../include/profile_selectors.php:33
 +msgid "Unavailable"
  msgstr ""
  
 -#: ../../include/datetime.php:155
 -msgid "hours"
 +#: ../../include/profile_selectors.php:33
 +msgid "Dating"
  msgstr ""
  
 -#: ../../include/datetime.php:156
 -msgid "minute"
 +#: ../../include/profile_selectors.php:33
 +msgid "Unfaithful"
  msgstr ""
  
 -#: ../../include/datetime.php:156
 -msgid "minutes"
 +#: ../../include/profile_selectors.php:33
 +msgid "Sex Addict"
  msgstr ""
  
 -#: ../../include/datetime.php:157
 -msgid "second"
 +#: ../../include/profile_selectors.php:33
 +msgid "Friends"
  msgstr ""
  
 -#: ../../include/datetime.php:157
 -msgid "seconds"
 +#: ../../include/profile_selectors.php:33
 +msgid "Friends/Benefits"
  msgstr ""
  
 -#: ../../include/datetime.php:164
 -msgid " ago"
 +#: ../../include/profile_selectors.php:33
 +msgid "Casual"
  msgstr ""
  
 -#: ../../include/dba.php:31
 -#, php-format
 -msgid "Cannot locate DNS info for database server '%s'"
 +#: ../../include/profile_selectors.php:33
 +msgid "Engaged"
  msgstr ""
  
 -#: ../../boot.php:808
 -msgid "Create a New Account"
 +#: ../../include/profile_selectors.php:33
 +msgid "Married"
  msgstr ""
  
 -#: ../../boot.php:815
 -msgid "Nickname or Email address: "
 +#: ../../include/profile_selectors.php:33
 +msgid "Partners"
  msgstr ""
  
 -#: ../../boot.php:816
 -msgid "Password: "
 +#: ../../include/profile_selectors.php:33
 +msgid "Cohabiting"
  msgstr ""
  
 -#: ../../boot.php:821
 -msgid "Nickname/Email/OpenID: "
 +#: ../../include/profile_selectors.php:33
 +msgid "Happy"
  msgstr ""
  
 -#: ../../boot.php:822
 -msgid "Password (if not OpenID): "
 +#: ../../include/profile_selectors.php:33
 +msgid "Not Looking"
  msgstr ""
  
 -#: ../../boot.php:825
 -msgid "Forgot your password?"
 +#: ../../include/profile_selectors.php:33
 +msgid "Swinger"
  msgstr ""
  
 -#: ../../boot.php:826
 -msgid "Password Reset"
 +#: ../../include/profile_selectors.php:33
 +msgid "Betrayed"
  msgstr ""
  
 -#: ../../boot.php:1077
 -msgid "prev"
 +#: ../../include/profile_selectors.php:33
 +msgid "Separated"
  msgstr ""
  
 -#: ../../boot.php:1079
 -msgid "first"
 +#: ../../include/profile_selectors.php:33
 +msgid "Unstable"
  msgstr ""
  
 -#: ../../boot.php:1108
 -msgid "last"
 +#: ../../include/profile_selectors.php:33
 +msgid "Divorced"
  msgstr ""
  
 -#: ../../boot.php:1111
 -msgid "next"
 +#: ../../include/profile_selectors.php:33
 +msgid "Widowed"
  msgstr ""
  
 -#: ../../boot.php:1837
 -#, php-format
 -msgid "%s likes this."
 +#: ../../include/profile_selectors.php:33
 +msgid "Uncertain"
  msgstr ""
  
 -#: ../../boot.php:1837
 -#, php-format
 -msgid "%s doesn't like this."
 +#: ../../include/profile_selectors.php:33
 +msgid "Complicated"
  msgstr ""
  
 -#: ../../boot.php:1841
 -#, php-format
 -msgid "<span  %1$s>%2$d people</span> like this."
 +#: ../../include/profile_selectors.php:33
 +msgid "Don't care"
  msgstr ""
  
 -#: ../../boot.php:1843
 -#, php-format
 -msgid "<span  %1$s>%2$d people</span> don't like this."
 +#: ../../include/profile_selectors.php:33
 +msgid "Ask me"
  msgstr ""
  
 -#: ../../boot.php:1849
 -msgid "and"
 +#: ../../include/acl_selectors.php:132
 +msgid "Visible To:"
  msgstr ""
  
 -#: ../../boot.php:1852
 -#, php-format
 -msgid ", and %d other people"
 +#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
 +msgid "Groups"
  msgstr ""
  
 -#: ../../boot.php:1853
 -#, php-format
 -msgid "%s like this."
 +#: ../../include/acl_selectors.php:147
 +msgid "Except For:"
  msgstr ""
  
 -#: ../../boot.php:1853
 -#, php-format
 -msgid "%s don't like this."
 +#: ../../include/auth.php:27
 +msgid "Logged out."
  msgstr ""
  
 -#: ../../boot.php:2014
 -msgid "No contacts"
 +#: ../../include/datetime.php:44 ../../include/datetime.php:46
 +msgid "Miscellaneous"
  msgstr ""
  
 -#: ../../boot.php:2267
 -msgid "Connect"
 +#: ../../include/datetime.php:148
 +msgid "less than a second ago"
  msgstr ""
  
 -#: ../../boot.php:2277
 -msgid "Location:"
 +#: ../../include/datetime.php:151
 +msgid "year"
  msgstr ""
  
 -#: ../../boot.php:2281
 -msgid ", "
 +#: ../../include/datetime.php:151
 +msgid "years"
  msgstr ""
  
 -#: ../../boot.php:2289
 -msgid "Gender:"
 +#: ../../include/datetime.php:152
 +msgid "month"
  msgstr ""
  
 -#: ../../boot.php:2293
 -msgid "Status:"
 +#: ../../include/datetime.php:152
 +msgid "months"
  msgstr ""
  
 -#: ../../boot.php:2295
 -msgid "Homepage:"
 +#: ../../include/datetime.php:153
 +msgid "week"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Monday"
 +#: ../../include/datetime.php:153
 +msgid "weeks"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Tuesday"
 +#: ../../include/datetime.php:154
 +msgid "day"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Wednesday"
 +#: ../../include/datetime.php:154
 +msgid "days"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Thursday"
 +#: ../../include/datetime.php:155
 +msgid "hour"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Friday"
 +#: ../../include/datetime.php:155
 +msgid "hours"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Saturday"
 +#: ../../include/datetime.php:156
 +msgid "minute"
  msgstr ""
  
 -#: ../../boot.php:2386
 -msgid "Sunday"
 +#: ../../include/datetime.php:156
 +msgid "minutes"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "January"
 +#: ../../include/datetime.php:157
 +msgid "second"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "February"
 +#: ../../include/datetime.php:157
 +msgid "seconds"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "March"
 +#: ../../include/datetime.php:164
 +msgid " ago"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "April"
 +#: ../../include/nav.php:56 ../../include/nav.php:91
 +msgid "Home"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "May"
 +#: ../../include/nav.php:64
 +msgid "Apps"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "June"
 +#: ../../include/nav.php:77
 +msgid "Directory"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "July"
 +#: ../../include/nav.php:87
 +msgid "Network"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "August"
 +#: ../../include/nav.php:96
 +msgid "Notifications"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "September"
 +#: ../../include/nav.php:104
 +msgid "Manage"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "October"
 +#: ../../include/nav.php:107
 +msgid "Settings"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "November"
 +#: ../../include/nav.php:109
 +msgid "Profiles"
  msgstr ""
  
 -#: ../../boot.php:2390
 -msgid "December"
 +#: ../../include/dba.php:31
 +#, php-format
 +msgid "Cannot locate DNS info for database server '%s'"
  msgstr ""
  
 -#: ../../boot.php:2424
 -msgid "Birthday Reminders"
 +#: ../../include/items.php:1027
 +msgid "Birthday:"
  msgstr ""
  
 -#: ../../boot.php:2425
 -msgid "Birthdays this week:"
 +#: ../../include/items.php:1371
 +msgid "You have a new follower at "
  msgstr ""
  
 -#: ../../boot.php:2426
 -msgid "(Adjusted for local time)"
 +#: ../../include/group.php:130
 +msgid "Create a new group"
  msgstr ""
  
 -#: ../../boot.php:2437
 -msgid "[today]"
 +#: ../../include/group.php:131
 +msgid "Everybody"
  msgstr ""
  
 -#: ../../boot.php:2634
 -msgid "link to source"
 +#: ../../include/oembed.php:57
 +msgid "Embedding disabled"
  msgstr ""

diff --combined util/strings.php
index 903e61e9e11216fb9addebb0cf9ce2cb4b418ece,907bfb6df800ac1d6fdb2f28e1e1a1c4715e667e..a1f8f9a1533994971185ece07be79396dd07a1bb
--- 1/util/strings.php
--- 2/util/strings.php
+++ b/util/strings.php
@@@ -31,6 -31,7 +31,6 @@@ $a->strings[', and %d other people'] = 
  $a->strings['%s like this.'] = '%s like this.';
  $a->strings['%s don\'t like this.'] = '%s don\'t like this.';
  $a->strings['No contacts'] = 'No contacts';
 -$a->strings['Contacts'] = 'Contacts';
  $a->strings['View Contacts'] = 'View Contacts';
  $a->strings['Search'] = 'Search';
  $a->strings['No profile'] = 'No profile';
@@@ -66,6 -67,6 +66,7 @@@ $a->strings['[today]'] = '[today]'
  $a->strings['link to source'] = 'link to source';
  $a->strings['Applications'] = 'Applications';
  $a->strings["Invite Friends"] = "Invite Friends";
++$a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
  $a->strings['Connect/Follow'] = 'Connect/Follow';
  $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara';
  $a->strings['Follow'] = 'Follow';
@@@ -86,6 -87,8 +87,8 @@@ $a->strings['Contact not found.'] = 'Co
  $a->strings['Mutual Friendship'] = 'Mutual Friendship';
  $a->strings['is a fan of yours'] = 'is a fan of yours';
  $a->strings['you are a fan of'] = 'you are a fan of';
+ $a->strings['Privacy Unavailable'] = 'Privacy Unavailable';
+ $a->strings['Private communications are not available for this contact.'] = 'Private communications are not available for this contact.';
  $a->strings['Never'] = 'Never';
  $a->strings["\x28Update was successful\x29"] = "\x28Update was successful\x29";
  $a->strings["\x28Update was not successful\x29"] = "\x28Update was not successful\x29";
@@@ -103,7 -106,6 +106,7 @@@ $a->strings['Unignore this contact'] = 
  $a->strings['Ignore this contact'] = 'Ignore this contact';
  $a->strings['Currently blocked'] = 'Currently blocked';
  $a->strings['Currently ignored'] = 'Currently ignored';
 +$a->strings['Contacts'] = 'Contacts';
  $a->strings['Show Blocked Connections'] = 'Show Blocked Connections';
  $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections';
  $a->strings['Finding: '] = 'Finding: ';
@@@ -211,9 -213,9 +214,11 @@@ $a->strings['Unable to remove group.'] 
  $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.';
--$a->strings['Database import succeeded.'] = 'Database import succeeded.';
++$a->strings['Proceed with Installation'] = 'Proceed with Installation';
++$a->strings['Your Friendika site database has been installed.'] = 'Your Friendika site database has been installed.';
  $a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
  $a->strings['Please see the file "INSTALL.txt".'] = 'Please see the file "INSTALL.txt".';
++$a->strings['Proceed to registration'] = 'Proceed to registration';
  $a->strings['Database import failed.'] = 'Database import failed.';
  $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
  $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
@@@ -266,6 -268,6 +271,8 @@@ $a->strings["Welcome back %s"] = "Welco
  $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages';
  $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29";
  $a->strings['Select an identity to manage: '] = 'Select an identity to manage: ';
++$a->strings['Profile Match'] = 'Profile Match';
++$a->strings['No matches'] = 'No matches';
  $a->strings['No recipient selected.'] = 'No recipient selected.';
  $a->strings['[no subject]'] = '[no subject]';
  $a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
@@@ -277,6 -279,7 +284,7 @@@ $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:';
@@@ -287,6 -290,10 +295,10 @@@ $a->strings['Delete message'] = 'Delet
  $a->strings['Send Reply'] = 'Send Reply';
  $a->strings['Normal View'] = 'Normal View';
  $a->strings['New Item View'] = 'New Item View';
+ $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['No such group'] = 'No such group';
  $a->strings['Group is empty'] = 'Group is empty';
  $a->strings['Group: '] = 'Group: ';
@@@ -343,6 -350,9 +355,9 @@@ $a->strings['Example: @bob, @Barbara_Je
  $a->strings['Recent Photos'] = 'Recent Photos';
  $a->strings['Upload New Photos'] = 'Upload New Photos';
  $a->strings['View Album'] = 'View Album';
+ $a->strings['Status'] = 'Status';
+ $a->strings['Profile'] = 'Profile';
+ $a->strings['Photos'] = 'Photos';
  $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
  $a->strings['Unable to process image'] = 'Unable to process image';
  $a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
@@@ -442,7 -452,7 +457,7 @@@ $a->strings['minutes'] = 'minutes'
  $a->strings['second'] = 'second';
  $a->strings['seconds'] = 'seconds';
  $a->strings[' ago'] = ' ago';
- $a->strings['Cannot locate DNS info for database server \'%s\'',$server] = 'Cannot locate DNS info for database server \'%s\'',$server;
+ $a->strings['Cannot locate DNS info for database server \'%s\''] = 'Cannot locate DNS info for database server \'%s\'';
  $a->strings['Create a new group'] = 'Create a new group';
  $a->strings['Everybody'] = 'Everybody';
  $a->strings['Birthday:'] = 'Birthday:';
@@@ -710,6 -720,7 +725,6 @@@ $a->strings['America/Managua'] = 'Ameri
  $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';
@@@ -728,6 -739,7 +743,6 @@@ $a->strings['America/Nome'] = 'America/
  $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';
@@@ -744,6 -756,7 +759,6 @@@ $a->strings['America/Regina'] = 'Americ
  $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';
@@@ -772,6 -785,7 +787,6 @@@ $a->strings['America/Yellowknife'] = 'A
  $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';
@@@ -834,6 -848,7 +849,6 @@@ $a->strings['Asia/Makassar'] = 'Asia/Ma
  $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';

diff --combined view/it/strings.php
index 1312f0013534d3c8904d85e37c8ca4032f330dbd,a771f933d6c70ff12549341677b04c2cf9debf4b..1e0840dd724dfb6fed1bfbf43239c6d0b2a88312
--- 1/view/it/strings.php
--- 2/view/it/strings.php
+++ b/view/it/strings.php
@@@ -165,6 -165,9 +165,9 @@@ $a->strings["Example: @bob, @Barbara_Je
  $a->strings["Recent Photos"] = "Foto recenti";
  $a->strings["Upload New Photos"] = "Carica nuova foto";
  $a->strings["View Album"] = "Vedi album";
+ $a->strings['Status'] = 'Stato';
+ $a->strings['Profile'] = 'Profilo';
+ $a->strings['Photos'] = 'Foto';
  $a->strings["Item not found."] = "Elemento non trovato.";
  $a->strings["View \$owner_name's profile"] = "Guarda il profilo di \$owner_name";
  $a->strings["to"] = "a";
@@@ -284,6 -287,11 +287,11 @@@ $a->strings["The database configuratio
  $a->strings["Errors encountered creating database tables."] = "Errori creando le tabelle nel database.";
  $a->strings["Normal View"] = "Vista normale";
  $a->strings["New Item View"] = "Vista Nuovi Elementi";
+ $a->strings['Please enter a link URL:'] = 'Inserisci l\'indirizzo del collegamento:';
+ $a->strings['Please enter a YouTube link:'] = 'Inserisci un collegamento a YouTube:';
+ $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?'] = 'Dove ti trovi ora?';
  $a->strings["No such group"] = "Nessun gruppo";
  $a->strings["Group is empty"] = "Il gruppo è vuoto";
  $a->strings["Group: "] = "Gruppo: ";
@@@ -573,7 -581,3 +581,7 @@@ $a->strings["Next >>"] = "Succ >>"
  $a->strings["Item not found"] = "Elemento non trovato";
  $a->strings["Edit post"] = "Modifica messaggio";
  $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
 +$a->strings["%d Contact"] = array(
 +      0 => "%d Contatto",
 +      1 => "%d Contatti",
 +);