Merge branch 'fabrixxm-master'

5 files changed, 409 insertions, 282 deletions

diff --git a/boot.php b/boot.php
index 657cc4691..72ec81c11 100644
--- a/boot.php
+++ b/boot.php
@@ -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())
@@ -2665,4 +2665,4 @@ function extract_item_authors($arr,$uid) {
 		}
 	}
 	return array();		
-}}
\ No newline at end of file
+}}
diff --git a/util/messages.po b/util/messages.po
index 44638bd9c..beff3e4b6 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.913\n"
+"Project-Id-Version: 2.1.925\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-18 11:02+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,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../index.php:187
+#: ../../index.php:194
 msgid "Not Found"
 msgstr ""
 
-#: ../../index.php:188
+#: ../../index.php:195
 msgid "Page not found."
 msgstr ""
 
-#: ../../index.php:243 ../../mod/group.php:88
+#: ../../index.php:250 ../../mod/group.php:88
 msgid "Permission denied"
 msgstr ""
 
-#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../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:224
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
 #: ../../mod/settings.php:14 ../../mod/settings.php:19
-#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772
-#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50
-#: ../../mod/contacts.php:101 ../../mod/register.php:25
-#: ../../mod/network.php:6 ../../mod/notifications.php:56
-#: ../../mod/item.php:57 ../../mod/item.php:616 ../../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
+#: ../../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: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 ""
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
+#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61
 msgid "Register"
 msgstr ""
 
@@ -103,180 +103,185 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: ../../boot.php:1831
+#: ../../boot.php:1837
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../boot.php:1831
+#: ../../boot.php:1837
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../boot.php:1835
+#: ../../boot.php:1841 ../../test.php:8
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../boot.php:1837
+#: ../../boot.php:1843
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../boot.php:1843
+#: ../../boot.php:1849
 msgid "and"
 msgstr ""
 
-#: ../../boot.php:1846
+#: ../../boot.php:1852
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../boot.php:1847
+#: ../../boot.php:1853
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../boot.php:1847
+#: ../../boot.php:1853
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../boot.php:2008
+#: ../../boot.php:2014
 msgid "No contacts"
 msgstr ""
 
-#: ../../boot.php:2016 ../../mod/contacts.php:303
-#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
-#: ../../include/nav.php:111
-msgid "Contacts"
-msgstr ""
+#: ../../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
+#: ../../boot.php:2055 ../../mod/search.php:17 ../../include/nav.php:67
 msgid "Search"
 msgstr ""
 
-#: ../../boot.php:2204 ../../mod/profile.php:8
+#: ../../boot.php:2210 ../../mod/profile.php:8
 msgid "No profile"
 msgstr ""
 
-#: ../../boot.php:2261
+#: ../../boot.php:2267
 msgid "Connect"
 msgstr ""
 
-#: ../../boot.php:2271
+#: ../../boot.php:2277
 msgid "Location:"
 msgstr ""
 
-#: ../../boot.php:2275
+#: ../../boot.php:2281
 msgid ", "
 msgstr ""
 
-#: ../../boot.php:2283
+#: ../../boot.php:2289
 msgid "Gender:"
 msgstr ""
 
-#: ../../boot.php:2287
+#: ../../boot.php:2293
 msgid "Status:"
 msgstr ""
 
-#: ../../boot.php:2289
+#: ../../boot.php:2295
 msgid "Homepage:"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Monday"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Tuesday"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Wednesday"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Thursday"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Friday"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Saturday"
 msgstr ""
 
-#: ../../boot.php:2380
+#: ../../boot.php:2386
 msgid "Sunday"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "January"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "February"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "March"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "April"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "May"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "June"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "July"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "August"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "September"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "October"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "November"
 msgstr ""
 
-#: ../../boot.php:2384
+#: ../../boot.php:2390
 msgid "December"
 msgstr ""
 
-#: ../../boot.php:2413
+#: ../../boot.php:2424
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../boot.php:2425
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:2414
+#: ../../boot.php:2426
 msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../boot.php:2423
+#: ../../boot.php:2437
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:2620
+#: ../../boot.php:2634
 msgid "link to source"
 msgstr ""
 
@@ -299,8 +304,8 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857
-#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109
+#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858
+#: ../../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
@@ -316,18 +321,18 @@ msgid "Image exceeds size limit of %d"
 msgstr ""
 
 #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:570
+#: ../../mod/photos.php:571
 msgid "Unable to process image."
 msgstr ""
 
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/item.php:184
+#: ../../mod/wall_upload.php:95 ../../mod/item.php:212
 #: ../../mod/message.php:93
 msgid "Wall Photos"
 msgstr ""
 
 #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
-#: ../../mod/photos.php:588
+#: ../../mod/photos.php:589
 msgid "Image upload failed."
 msgstr ""
 
@@ -335,8 +340,8 @@ msgstr ""
 #: ../../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:423 ../../mod/item.php:446
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350
+#: ../../mod/item.php:475 ../../mod/item.php:498
+#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373
 msgid "Administrator"
 msgstr ""
 
@@ -353,105 +358,164 @@ msgstr ""
 msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/profile.php:151 ../../mod/network.php:91
+#: ../../mod/profile.php:102
+msgid "Status"
+msgstr ""
+
+#: ../../mod/profile.php:103
+msgid "Profile"
+msgstr ""
+
+#: ../../mod/profile.php:104
+msgid "Photos"
+msgstr ""
+
+#: ../../mod/profile.php:137 ../../mod/network.php:69
+#: ../../mod/message.php:172
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/profile.php:138 ../../mod/network.php:70
+msgid "Please enter a YouTube link:"
+msgstr ""
+
+#: ../../mod/profile.php:139 ../../mod/network.php:71
+msgid "Please enter a video(.ogg) link/URL:"
+msgstr ""
+
+#: ../../mod/profile.php:140 ../../mod/network.php:72
+msgid "Please enter an audio(.ogg) link/URL:"
+msgstr ""
+
+#: ../../mod/profile.php:141 ../../mod/network.php:73
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../mod/profile.php:164 ../../mod/profile.php:325
+#: ../../mod/photos.php:1086 ../../mod/display.php:158
+#: ../../mod/network.php:96 ../../mod/network.php:375
 msgid "Share"
 msgstr ""
 
-#: ../../mod/profile.php:152 ../../mod/network.php:92
-#: ../../mod/message.php:185 ../../mod/message.php:319
+#: ../../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:153 ../../mod/network.php:93
-#: ../../mod/message.php:186 ../../mod/message.php:320
+#: ../../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:154 ../../mod/network.php:94
+#: ../../mod/profile.php:167 ../../mod/editpost.php:65
+#: ../../mod/network.php:99
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/profile.php:155 ../../mod/network.php:95
+#: ../../mod/profile.php:168 ../../mod/editpost.php:66
+#: ../../mod/network.php:100
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/profile.php:169 ../../mod/editpost.php:67
+#: ../../mod/network.php:101
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/profile.php:170 ../../mod/editpost.php:68
+#: ../../mod/network.php:102
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/profile.php:156 ../../mod/network.php:96
+#: ../../mod/profile.php:171 ../../mod/editpost.php:69
+#: ../../mod/network.php:103
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/profile.php:157 ../../mod/profile.php:309
-#: ../../mod/photos.php:1052 ../../mod/display.php:158
-#: ../../mod/network.php:97 ../../mod/network.php:367
-#: ../../mod/message.php:187 ../../mod/message.php:321
+#: ../../mod/profile.php:172 ../../mod/profile.php:326
+#: ../../mod/photos.php:1087 ../../mod/display.php:159
+#: ../../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:158 ../../mod/network.php:98
+#: ../../mod/profile.php:173 ../../mod/editpost.php:71
+#: ../../mod/network.php:105
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/profile.php:165 ../../mod/network.php:104
+#: ../../mod/profile.php:180 ../../mod/editpost.php:77
+#: ../../mod/network.php:111
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/profile.php:167 ../../mod/network.php:106
+#: ../../mod/profile.php:182 ../../mod/editpost.php:79
+#: ../../mod/network.php:113
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/profile.php:300 ../../mod/photos.php:935
-#: ../../mod/display.php:149 ../../mod/network.php:321
+#: ../../mod/profile.php:316 ../../mod/photos.php:962
+#: ../../mod/display.php:149 ../../mod/network.php:329
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/profile.php:307 ../../mod/photos.php:1050
-#: ../../mod/display.php:156 ../../mod/network.php:365
+#: ../../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:308 ../../mod/photos.php:1051
-#: ../../mod/display.php:157 ../../mod/network.php:366
+#: ../../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:321 ../../mod/photos.php:1071
-#: ../../mod/photos.php:1111 ../../mod/photos.php:1140
-#: ../../mod/display.php:170 ../../mod/network.php:380
+#: ../../mod/profile.php:338 ../../mod/photos.php:1106
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
+#: ../../mod/display.php:171 ../../mod/network.php:389
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/profile.php:361 ../../mod/photos.php:1168
-#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137
+#: ../../mod/profile.php:362 ../../mod/display.php:222
+#: ../../mod/editpost.php:62 ../../mod/network.php:397
+msgid "Edit"
+msgstr ""
+
+#: ../../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:382 ../../mod/search.php:116
-#: ../../mod/display.php:258 ../../mod/network.php:272
-#: ../../mod/network.php:434
+#: ../../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:414 ../../mod/display.php:312
-#: ../../mod/register.php:422 ../../mod/network.php:471
+#: ../../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/follow.php:173
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/follow.php:173
+#: ../../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/follow.php:230
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/follow.php:270
+#: ../../mod/follow.php:276
 msgid "following"
 msgstr ""
 
@@ -462,8 +526,8 @@ msgstr ""
 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
 #: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
 #: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234
-#: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849
-#: ../../mod/photos.php:864 ../../mod/register.php:267
+#: ../../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 ""
@@ -505,8 +569,8 @@ msgstr ""
 msgid "Account approved."
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:234
-#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -514,37 +578,37 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:196
+#: ../../mod/profiles.php:199
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:251
+#: ../../mod/profiles.php:254
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:267 ../../mod/profiles.php:298
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:286 ../../mod/profiles.php:325
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:307
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:370
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:380
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:418
+#: ../../mod/profiles.php:422
 msgid "Profile Image"
 msgstr ""
 
@@ -564,55 +628,59 @@ msgstr ""
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:95
+#: ../../mod/settings.php:97
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:97
+#: ../../mod/settings.php:99
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:103
+#: ../../mod/settings.php:105
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:105
+#: ../../mod/settings.php:107
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:161
+#: ../../mod/settings.php:165
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:211
+#: ../../mod/settings.php:215
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:212
+#: ../../mod/settings.php:216
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:218
+#: ../../mod/settings.php:222
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:269
 msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:269
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:301
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:352
+#: ../../mod/settings.php:358
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/search.php:131 ../../mod/network.php:287
+#: ../../mod/search.php:54
+msgid "No results."
+msgstr ""
+
+#: ../../mod/search.php:131 ../../mod/network.php:295
 msgid "View in context"
 msgstr ""
 
@@ -620,12 +688,12 @@ msgstr ""
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780
-#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198
-#: ../../mod/photos.php:1209 ../../include/Photo.php:225
+#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
+#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1244 ../../include/Photo.php:225
 #: ../../include/Photo.php:232 ../../include/Photo.php:239
-#: ../../include/items.php:959 ../../include/items.php:962
-#: ../../include/items.php:965
+#: ../../include/items.php:982 ../../include/items.php:985
+#: ../../include/items.php:988
 msgid "Contact Photos"
 msgstr ""
 
@@ -637,134 +705,150 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:858
+#: ../../mod/photos.php:134 ../../mod/photos.php:859
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1033
+#: ../../mod/photos.php:197 ../../mod/photos.php:1067
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:468
+#: ../../mod/photos.php:469
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:468 ../../mod/like.php:110
+#: ../../mod/photos.php:469 ../../mod/like.php:110
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:468
+#: ../../mod/photos.php:469
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306
+#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:660
+#: ../../mod/photos.php:661
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:807
+#: ../../mod/photos.php:808
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:810 ../../mod/photos.php:853
+#: ../../mod/photos.php:811 ../../mod/photos.php:854
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:811
+#: ../../mod/photos.php:812
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:813 ../../mod/photos.php:1028
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:868
+#: ../../mod/photos.php:869
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:878 ../../mod/photos.php:1228
+#: ../../mod/photos.php:879 ../../mod/photos.php:1263
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:908
+#: ../../mod/photos.php:909
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:929
+#: ../../mod/photos.php:956
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:931
+#: ../../mod/photos.php:958
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:944
+#: ../../mod/photos.php:969
+msgid "<< Prev"
+msgstr ""
+
+#: ../../mod/photos.php:973
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1002
+#: ../../mod/photos.php:977
+msgid "Next >>"
+msgstr ""
+
+#: ../../mod/photos.php:1036
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1012
+#: ../../mod/photos.php:1046
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1055
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1058
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1026
+#: ../../mod/photos.php:1060
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1030
+#: ../../mod/photos.php:1064
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1214
+#: ../../mod/photos.php:1249
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1218
+#: ../../mod/photos.php:1253
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1234
+#: ../../mod/photos.php:1269
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
+#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
 msgid "Item not found."
 msgstr ""
 
-#: ../../mod/display.php:259 ../../mod/network.php:435
+#: ../../mod/display.php:263 ../../mod/network.php:447
 msgid "View $owner_name's profile"
 msgstr ""
 
-#: ../../mod/display.php:260 ../../mod/network.php:436
+#: ../../mod/display.php:264 ../../mod/network.php:448
 msgid "to"
 msgstr ""
 
-#: ../../mod/display.php:261 ../../mod/network.php:437
+#: ../../mod/display.php:265 ../../mod/network.php:449
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/display.php:262 ../../mod/network.php:438
+#: ../../mod/display.php:266 ../../mod/network.php:450
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/display.php:300
+#: ../../mod/display.php:305
 msgid "Item has been removed."
 msgstr ""
 
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr ""
+
+#: ../../mod/editpost.php:32
+msgid "Edit post"
+msgstr ""
+
 #: ../../mod/invite.php:28
 #, php-format
 msgid "%s : Not a valid email address."
@@ -795,7 +879,7 @@ msgstr ""
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316
+#: ../../mod/invite.php:59 ../../mod/message.php:183 ../../mod/message.php:317
 msgid "Your message:"
 msgstr ""
 
@@ -817,163 +901,180 @@ msgstr ""
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../mod/contacts.php:16
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
+msgstr ""
+
+#: ../../mod/contacts.php:19
 msgid "Connect/Follow"
 msgstr ""
 
-#: ../../mod/contacts.php:17
+#: ../../mod/contacts.php:20
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../mod/contacts.php:18
+#: ../../mod/contacts.php:21
 msgid "Follow"
 msgstr ""
 
-#: ../../mod/contacts.php:38 ../../mod/contacts.php:119
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:52
+#: ../../mod/contacts.php:57
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/contacts.php:83
+#: ../../mod/contacts.php:88
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402
+#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:141
+#: ../../mod/contacts.php:146
 msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:141
+#: ../../mod/contacts.php:146
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:155
+#: ../../mod/contacts.php:160
 msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:155
+#: ../../mod/contacts.php:160
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:176
+#: ../../mod/contacts.php:181
 msgid "stopped following"
 msgstr ""
 
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:200
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114
+#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
 msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/contacts.php:223 ../../mod/contacts.php:344
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:227 ../../mod/contacts.php:348
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:352
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:248
+#: ../../mod/contacts.php:252
+msgid "Privacy Unavailable"
+msgstr ""
+
+#: ../../mod/contacts.php:253
+msgid "Private communications are not available for this contact."
+msgstr ""
+
+#: ../../mod/contacts.php:256
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:252
+#: ../../mod/contacts.php:260
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:252
+#: ../../mod/contacts.php:260
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:255
+#: ../../mod/contacts.php:263
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:256
+#: ../../mod/contacts.php:264
 msgid "Visit $name's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:257
+#: ../../mod/contacts.php:265
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:258
+#: ../../mod/contacts.php:266
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:259
+#: ../../mod/contacts.php:267
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:261
+#: ../../mod/contacts.php:269
 msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/contacts.php:262
+#: ../../mod/contacts.php:270
 msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:272
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:275
 msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:275
 msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:268
+#: ../../mod/contacts.php:276
 msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:268
+#: ../../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:305
+#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140
+#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
+msgid "Contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:313
 msgid "Show Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:305
+#: ../../mod/contacts.php:313
 msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:307 ../../mod/directory.php:38
+#: ../../mod/contacts.php:315 ../../mod/directory.php:38
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:308
+#: ../../mod/contacts.php:316
 msgid "Find"
 msgstr ""
 
-#: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44
+#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44
 msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:369
+#: ../../mod/contacts.php:377
 msgid "Edit contact"
 msgstr ""
 
@@ -1077,168 +1178,170 @@ msgstr ""
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:404
-msgid ""
-"Members of this network prefer to communicate with real people who use their "
-"real names."
-msgstr ""
-
-#: ../../mod/register.php:413
+#: ../../mod/register.php:415
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
+#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
+#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619
 msgid "No"
 msgstr ""
 
-#: ../../mod/register.php:429
+#: ../../mod/register.php:431
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:437
+#: ../../mod/register.php:439
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:438
+#: ../../mod/register.php:440
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:439
+#: ../../mod/register.php:441
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:440
+#: ../../mod/register.php:442
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/install.php:30
+#: ../../mod/install.php:33
 msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../mod/install.php:35
+#: ../../mod/install.php:38
 msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/install.php:66
-msgid "Database import succeeded."
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/install.php:67
+#: ../../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:68 ../../mod/install.php:75 ../../mod/install.php:175
+#: ../../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/install.php:78
+msgid "Proceed to registration"
+msgstr ""
+
+#: ../../mod/install.php:84
 msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/install.php:74
+#: ../../mod/install.php:85
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr ""
 
-#: ../../mod/install.php:84
+#: ../../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 ""
 
@@ -1250,15 +1353,15 @@ msgstr ""
 msgid "New Item View"
 msgstr ""
 
-#: ../../mod/network.php:149
+#: ../../mod/network.php:156
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:160
+#: ../../mod/network.php:167
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:164
+#: ../../mod/network.php:171
 msgid "Group: "
 msgstr ""
 
@@ -1417,7 +1520,7 @@ msgid ""
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341
+#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1521,41 +1624,41 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:98
+#: ../../mod/item.php:126
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:422
+#: ../../mod/item.php:474
 #, php-format
 msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/item.php:445
+#: ../../mod/item.php:497
 #, php-format
 msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/item.php:471
+#: ../../mod/item.php:523
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:489
+#: ../../mod/item.php:541
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/item.php:491
+#: ../../mod/item.php:543
 msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/item.php:493
+#: ../../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/item.php:495
+#: ../../mod/item.php:547
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -1620,35 +1723,35 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:177
+#: ../../mod/message.php:178
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/message.php:178 ../../mod/message.php:312
+#: ../../mod/message.php:179 ../../mod/message.php:313
 msgid "To:"
 msgstr ""
 
-#: ../../mod/message.php:179 ../../mod/message.php:313
+#: ../../mod/message.php:180 ../../mod/message.php:314
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/message.php:221
+#: ../../mod/message.php:222
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:234
+#: ../../mod/message.php:235
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:264
+#: ../../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 ""
 
@@ -1767,6 +1870,14 @@ msgstr ""
 msgid "Unable to remove group."
 msgstr ""
 
+#: ../../mod/match.php:10
+msgid "Profile Match"
+msgstr ""
+
+#: ../../mod/match.php:49
+msgid "No matches"
+msgstr ""
+
 #: ../../addon/twitter/twitter.php:64
 msgid "Post to Twitter"
 msgstr ""
@@ -2390,11 +2501,16 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/items.php:1004
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr ""
+
+#: ../../include/items.php:1027
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/items.php:1348
+#: ../../include/items.php:1371
 msgid "You have a new follower at "
 msgstr ""
 
diff --git a/util/strings.php b/util/strings.php
index 907bfb6df..a1f8f9a15 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -31,7 +31,6 @@ $a->strings[', and %d other people'] = ', 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';
@@ -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';
@@ -106,6 +106,7 @@ $a->strings['Unignore this contact'] = '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: ';
@@ -213,9 +214,11 @@ $a->strings['Unable to remove group.'] = '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.';
@@ -268,6 +271,8 @@ $a->strings["Welcome back %s"] = "Welcome back %s";
 $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.';
@@ -720,7 +725,6 @@ $a->strings['America/Managua'] = 'America/Managua';
 $a->strings['America/Manaus'] = 'America/Manaus';
 $a->strings['America/Marigot'] = 'America/Marigot';
 $a->strings['America/Martinique'] = 'America/Martinique';
-$a->strings['America/Matamoros'] = 'America/Matamoros';
 $a->strings['America/Mazatlan'] = 'America/Mazatlan';
 $a->strings['America/Mendoza'] = 'America/Mendoza';
 $a->strings['America/Menominee'] = 'America/Menominee';
@@ -739,7 +743,6 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
-$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@ -756,7 +759,6 @@ $a->strings['America/Regina'] = 'America/Regina';
 $a->strings['America/Resolute'] = 'America/Resolute';
 $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
 $a->strings['America/Rosario'] = 'America/Rosario';
-$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
 $a->strings['America/Santarem'] = 'America/Santarem';
 $a->strings['America/Santiago'] = 'America/Santiago';
 $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@@ -785,7 +787,6 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
 $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
 $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
 $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
-$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
 $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
 $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
 $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@ -848,7 +849,6 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
-$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';
diff --git a/view/it/messages.po b/view/it/messages.po
index 73ee9e3ad..11813a3d8 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.913\n"
+"Project-Id-Version: 2.1.921\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-18 10:32+0100\n"
+"POT-Creation-Date: 2011-03-23 13:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Fabio Comuni <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian <fabrix.xm@gmail.com>\n"
-"Language: it-IT\n"
+"Language: It\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -118,7 +118,7 @@ msgstr "Piace a %s."
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."
 
-#: ../../boot.php:1835
+#: ../../boot.php:1835 ../../test.php:8
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "Piace a <span %1$s>%2$d persone</span>."
@@ -2598,3 +2598,10 @@ msgstr "Modifica messaggio"
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
+
+#: ../../boot.php:2016
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contatto"
+msgstr[1] "%d Contatti"
diff --git a/view/it/strings.php b/view/it/strings.php
index a771f933d..1e0840dd7 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -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",
+);