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

6 files changed, 291 insertions, 206 deletions

diff --git a/util/.htaccess b/util/.htaccess
new file mode 100644
index 000000000..b311c14c2
--- /dev/null
+++ b/util/.htaccess
@@ -0,0 +1,5 @@
+Options -Indexes
+
+# Remove the following line or modify it to run the string translator utility
+Deny from all
+
diff --git a/util/README b/util/README
index c6bc032a5..cb2fd9b55 100644
--- a/util/README
+++ b/util/README
@@ -49,8 +49,8 @@ Placeholders
 Do not translate placeholders in strings! Things like %s, %d, %1$s and $somename
 are used to add dynamic content to the string.
 
-%s rappresent a dynamic string, like in "Welcome to %s"
-%d rappresent a dynamic number, like in "%d new messages"
+%s represents a dynamic string, like in "Welcome to %s"
+%d represents a dynamic number, like in "%d new messages"
 $somename is a variable like in php
 In %1$s %2$s,  the numbers are the position index of multiple dynamic content.
 You could swap position in string of indexed placeholders.
@@ -78,11 +78,11 @@ More info at http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
 
 Xgettext and .po workflow
 
-1. Run utils/run_xgettext.sh script (on *unix sistems, with GNU xgettext installed)
+1. Run util/run_xgettext.sh script (on *unix sistems, with GNU xgettext installed)
 	This script runs xgettext on source tree, extracting strings from t() and tt()
-	functions, and creates a utils/messages.po file.
-2. copy utils/messages.po to views/<langauage>/messages.po
-3. open views/<langauage>/messages.po with a text editor and fill in infos in
+	functions, and creates a util/messages.po file.
+2. copy util/messages.po to view/<langauage>/messages.po
+3. open view/<langauage>/messages.po with a text editor and fill in infos in
 	"Last-Translator: FULL NAME <EMAIL@ADDRESS>"
 	"Language-Team: LANGUAGE <LL@li.org>\n"
 	"Language: \n"
@@ -102,19 +102,20 @@ Xgettext and .po workflow
 	of the many .po editors out there, like QtLinguist
 	
 5. run 
-	$ php utils/po2php.php views/<language>/messages.po
+	$ php util/po2php.php view/<language>/messages.po
  	to create the strings.php file
  	
 When strings are added or modified in source, you could run
-	$ utils/run_xgettext.sh views/<language>/messages.po
+	$ util/run_xgettext.sh view/<language>/messages.po
 	to extraxt strings from source files and join them with the existing .po file:
 	new strings are added, the existing are not overwritten.
 	
 If you already translated Friendika using strings.php, you could import your old
 translation to messages.po. Run:
-$ php utils/php2po.php views/<language>/strings.php
+$ php util/php2po.php view/<language>/strings.php
 
 
+You may also use the util/string_translator.php web interface to translate the string file, but it is disabled for website security reasons. The web server will need write permission to your language directories and the "Deny ..." line in util/.htaccess will need to be modified or commented to use the utility. 
  
 
       
diff --git a/util/messages.po b/util/messages.po
index e083c2a4c..beff3e4b6 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -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-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"
@@ -36,10 +36,10 @@ msgstr ""
 #: ../../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
@@ -103,185 +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 ../../test.php:8
+#: ../../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
+#: ../../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:2418
+#: ../../boot.php:2424
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:2419
+#: ../../boot.php:2425
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:2420
+#: ../../boot.php:2426
 msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../boot.php:2431
+#: ../../boot.php:2437
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:2628
+#: ../../boot.php:2634
 msgid "link to source"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgid "Select an identity to manage: "
 msgstr ""
 
 #: ../../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
@@ -358,131 +358,164 @@ msgstr ""
 msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/profile.php:156 ../../mod/profile.php:317
+#: ../../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: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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 ""
 
@@ -595,51 +628,51 @@ msgstr ""
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:96
+#: ../../mod/settings.php:97
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:98
+#: ../../mod/settings.php:99
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:104
+#: ../../mod/settings.php:105
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:106
+#: ../../mod/settings.php:107
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:163
+#: ../../mod/settings.php:165
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:213
+#: ../../mod/settings.php:215
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:214
+#: ../../mod/settings.php:216
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:220
+#: ../../mod/settings.php:222
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:266
+#: ../../mod/settings.php:269
 msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/settings.php:266
+#: ../../mod/settings.php:269
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:298
+#: ../../mod/settings.php:301
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:355
+#: ../../mod/settings.php:358
 msgid "Default Post Permissions"
 msgstr ""
 
@@ -647,7 +680,7 @@ msgstr ""
 msgid "No results."
 msgstr ""
 
-#: ../../mod/search.php:131 ../../mod/network.php:290
+#: ../../mod/search.php:131 ../../mod/network.php:295
 msgid "View in context"
 msgstr ""
 
@@ -788,19 +821,19 @@ msgstr ""
 msgid "Item not found."
 msgstr ""
 
-#: ../../mod/display.php:263 ../../mod/network.php:442
+#: ../../mod/display.php:263 ../../mod/network.php:447
 msgid "View $owner_name's profile"
 msgstr ""
 
-#: ../../mod/display.php:264 ../../mod/network.php:443
+#: ../../mod/display.php:264 ../../mod/network.php:448
 msgid "to"
 msgstr ""
 
-#: ../../mod/display.php:265 ../../mod/network.php:444
+#: ../../mod/display.php:265 ../../mod/network.php:449
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/display.php:266 ../../mod/network.php:445
+#: ../../mod/display.php:266 ../../mod/network.php:450
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -846,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 ""
 
@@ -868,168 +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: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/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 ""
 
@@ -1168,127 +1213,135 @@ msgstr ""
 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:74
+msgid "Your Friendika site database has been installed."
 msgstr ""
 
-#: ../../mod/install.php:67
+#: ../../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 ""
 
@@ -1300,15 +1353,15 @@ msgstr ""
 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 ""
 
@@ -1670,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 ""
 
@@ -1817,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 ""
diff --git a/util/string_translator.php b/util/string_translator.php
index 4112d9506..a718130d8 100644
--- a/util/string_translator.php
+++ b/util/string_translator.php
@@ -99,7 +99,7 @@ if (isset($_GET['lang'])){
 	$n2 = count($strings[$lang]);
 	
 	echo "<pre>";
-	echo "Tranlsate en to $lang<br>";
+	echo "Translate en to $lang<br>";
 	//echo "Translated $n2 over $n1 strings<br>";
 	echo "</pre><hr/>";
 
diff --git a/util/strings.php b/util/strings.php
index 903e61e9e..a1f8f9a15 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -66,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 @@ $a->strings['Contact not found.'] = 'Contact not found.';
 $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";
@@ -211,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.';
@@ -266,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.';
@@ -277,6 +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 +295,10 @@ $a->strings['Delete message'] = 'Delete message';
 $a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
+$a->strings['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 +355,9 @@ $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
 $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 +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:';
diff --git a/util/typo.php b/util/typo.php
index ac61ef6d3..84a50e15e 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -41,7 +41,10 @@
 
 	echo 'util/strings.php' . "\n";
 	include_once('util/strings.php');
+	echo count($a->strings) . ' strings' . "\n";
+
 	$files = glob('view/*/strings.php');
+
 	foreach($files as $file) {
 		echo $file . "\n";
 		include_once($file);