From be67cf663bc645d9825c7d6c6059663fead06645 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 19 Mar 2011 05:10:05 -0700
Subject: minor edits

---
 util/README                | 18 +++++++++---------
 util/string_translator.php |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'util')

diff --git a/util/README b/util/README
index c6bc032a5..8518aafd2 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,17 +102,17 @@ 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
 
 
  
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/>";
 
-- 
cgit v1.2.3


From 6a56ac2add9b96b97a66cdc63722f30234f4cb6b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 19 Mar 2011 15:12:04 -0700
Subject: language file security

---
 util/.htaccess | 5 +++++
 util/README    | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 util/.htaccess

(limited to 'util')

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 8518aafd2..cb2fd9b55 100644
--- a/util/README
+++ b/util/README
@@ -115,6 +115,7 @@ translation to messages.po. Run:
 $ 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. 
  
 
       
-- 
cgit v1.2.3


From 798c83b6aa3887622299ec4071c0d817953f3db9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 21 Mar 2011 00:21:35 -0700
Subject: localise some more templates

---
 util/strings.php | 117 +++++++++++++++++++++++++++++++++----------------------
 util/typo.php    |   3 ++
 2 files changed, 74 insertions(+), 46 deletions(-)

(limited to 'util')

diff --git a/util/strings.php b/util/strings.php
index 395901b06..042a33569 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -22,16 +22,14 @@ $a->strings['prev'] = 'prev';
 $a->strings['first'] = 'first';
 $a->strings['last'] = 'last';
 $a->strings['next'] = 'next';
-$a->strings[' likes this.'] = ' likes this.';
-$a->strings[' doesn\'t like this.'] = ' doesn\'t like this.';
-$a->strings['people'] = 'people';
-$a->strings['like this.'] = 'like this.';
-$a->strings['don\'t like this.'] = 'don\'t like this.';
+$a->strings['%s likes this.'] = '%s likes this.';
+$a->strings['%s doesn\'t like this.'] = '%s doesn\'t like this.';
+$a->strings['<span  %1$s>%2$d people</span> like this.'] = '<span  %1$s>%2$d people</span> like this.';
+$a->strings['<span  %1$s>%2$d people</span> don\'t like this.'] = '<span  %1$s>%2$d people</span> don\'t like this.';
 $a->strings['and'] = 'and';
-$a->strings[', and '] = ', and ';
-$a->strings[' other people'] = ' other people';
-$a->strings[' like this.'] = ' like this.';
-$a->strings[' don\'t like this.'] = ' don\'t like this.';
+$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';
@@ -62,10 +60,35 @@ $a->strings['September'] = 'September';
 $a->strings['October'] = 'October';
 $a->strings['November'] = 'November';
 $a->strings['December'] = 'December';
+$a->strings['Birthday Reminders'] = 'Birthday Reminders';
 $a->strings['Birthdays this week:'] = 'Birthdays this week:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
 $a->strings['[today]'] = '[today]';
 $a->strings['link to source'] = 'link to source';
+$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.';
+$a->strings['Wall Photos'] = 'Wall Photos';
+$a->strings['Message sent.'] = 'Message sent.';
+$a->strings['Message could not be sent.'] = 'Message could not be sent.';
+$a->strings['Messages'] = 'Messages';
+$a->strings['Inbox'] = 'Inbox';
+$a->strings['Outbox'] = 'Outbox';
+$a->strings['New Message'] = 'New Message';
+$a->strings['Message deleted.'] = 'Message deleted.';
+$a->strings['Conversation removed.'] = 'Conversation removed.';
+$a->strings['Send Private Message'] = 'Send Private Message';
+$a->strings['To:'] = 'To:';
+$a->strings['Subject:'] = 'Subject:';
+$a->strings['Your message:'] = 'Your message:';
+$a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Insert web link'] = 'Insert web link';
+$a->strings['Please wait'] = 'Please wait';
+$a->strings['No messages.'] = 'No messages.';
+$a->strings['Delete conversation'] = 'Delete conversation';
+$a->strings['Message not available.'] = 'Message not available.';
+$a->strings['Delete message'] = 'Delete message';
+$a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Connect/Follow'] = 'Connect/Follow';
@@ -88,6 +111,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";
@@ -126,11 +151,10 @@ $a->strings['Contact record was not found for you on our site.'] = 'Contact reco
 $a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
 $a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
 $a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
+$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
 $a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
 $a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
-$a->strings["From: Administrator@"] = "From: Administrator@";
-$a->strings['%s welcomes %s'] = '%s welcomes %s';
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
 $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.';
 $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.';
@@ -175,8 +199,9 @@ $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
 $a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
-$a->strings['Please wait'] = 'Please wait';
+$a->strings['Share'] = 'Share';
 $a->strings['This is you'] = 'This is you';
+$a->strings['Edit'] = 'Edit';
 $a->strings['Delete'] = 'Delete';
 $a->strings['View $name\'s profile'] = 'View $name\'s profile';
 $a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile';
@@ -185,6 +210,16 @@ $a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
 $a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
+$a->strings['Item not found'] = 'Item not found';
+$a->strings['Edit post'] = 'Edit post';
+$a->strings['Insert YouTube video'] = 'Insert YouTube video';
+$a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
+$a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio';
+$a->strings['Set your location'] = 'Set your location';
+$a->strings['Clear browser location'] = 'Clear browser location';
+$a->strings['Permission settings'] = 'Permission settings';
+$a->strings['CC: email addresses'] = 'CC: email addresses';
+$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
@@ -227,7 +262,6 @@ $a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address
 $a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.';
 $a->strings['Send invitations'] = 'Send invitations';
 $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
-$a->strings['Your message:'] = 'Your message:';
 $a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:';
 $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:';
 $a->strings["%d message sent."] = array(
@@ -236,56 +270,30 @@ $a->strings["%d message sent."] = array(
 );
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
-$a->strings['Wall Photos'] = 'Wall Photos';
 $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
 $a->strings["Administrator"] = "Administrator";
 $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
-$a->strings["Administrator@"] = "Administrator@";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
 $a->strings['You may visit them online at'] = 'You may visit them online at';
 $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
 $a->strings['%s posted an update.'] = '%s posted an update.';
 $a->strings['photo'] = 'photo';
 $a->strings['status'] = 'status';
-$a->strings['likes'] = 'likes';
-$a->strings['doesn\'t like'] = 'doesn\'t like';
-$a->strings["%s's"] = "%s's";
+$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s likes %2$s\'s %3$s';
+$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s doesn\'t like %2$s\'s %3$s';
 $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
 $a->strings['Visible to:'] = 'Visible to:';
 $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['No recipient selected.'] = 'No recipient selected.';
-$a->strings['[no subject]'] = '[no subject]';
-$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
-$a->strings['Message sent.'] = 'Message sent.';
-$a->strings['Message could not be sent.'] = 'Message could not be sent.';
-$a->strings['Messages'] = 'Messages';
-$a->strings['Inbox'] = 'Inbox';
-$a->strings['Outbox'] = 'Outbox';
-$a->strings['New Message'] = 'New Message';
-$a->strings['Message deleted.'] = 'Message deleted.';
-$a->strings['Conversation removed.'] = 'Conversation removed.';
-$a->strings['Send Private Message'] = 'Send Private Message';
-$a->strings['To:'] = 'To:';
-$a->strings['Subject:'] = 'Subject:';
-$a->strings['Upload photo'] = 'Upload photo';
-$a->strings['Insert web link'] = 'Insert web link';
-$a->strings['No messages.'] = 'No messages.';
-$a->strings['Delete conversation'] = 'Delete conversation';
-$a->strings['Message not available.'] = 'Message not available.';
-$a->strings['Delete message'] = 'Delete message';
-$a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Share'] = 'Share';
-$a->strings['Insert YouTube video'] = 'Insert YouTube video';
-$a->strings['Set your location'] = 'Set your location';
-$a->strings['Clear browser location'] = 'Clear browser location';
-$a->strings['Permission settings'] = 'Permission settings';
-$a->strings['CC: email addresses'] = 'CC: email addresses';
-$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
+$a->strings['Please enter a link URL:'] = 'Please enter a link URL:';
+$a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
+$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
+$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
+$a->strings['Where are you right now?'] = 'Where are you right now?';
 $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
@@ -330,7 +338,9 @@ $a->strings['Edit Album'] = 'Edit Album';
 $a->strings['View Photo'] = 'View Photo';
 $a->strings['Photo not available'] = 'Photo not available';
 $a->strings['Edit photo'] = 'Edit photo';
+$a->strings['<< Prev'] = '<< Prev';
 $a->strings['View Full Size'] = 'View Full Size';
+$a->strings['Next >>'] = 'Next >>';
 $a->strings['Tags: '] = 'Tags: ';
 $a->strings['[Remove any tag]'] = '[Remove any tag]';
 $a->strings['New album name'] = 'New album name';
@@ -384,6 +394,7 @@ $a->strings['Account approved.'] = 'Account approved.';
 $a->strings['Remove My Account'] = 'Remove My Account';
 $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.';
 $a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:';
+$a->strings['No results.'] = 'No results.';
 $a->strings['Passwords do not match. Password unchanged.'] = 'Passwords do not match. Password unchanged.';
 $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Empty passwords are not allowed. Password unchanged.';
 $a->strings['Password changed.'] = 'Password changed.';
@@ -438,6 +449,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['Create a new group'] = 'Create a new group';
 $a->strings['Everybody'] = 'Everybody';
 $a->strings['Birthday:'] = 'Birthday:';
@@ -623,7 +635,9 @@ $a->strings['America/Argentina/Jujuy'] = 'America/Argentina/Jujuy';
 $a->strings['America/Argentina/La_Rioja'] = 'America/Argentina/La_Rioja';
 $a->strings['America/Argentina/Mendoza'] = 'America/Argentina/Mendoza';
 $a->strings['America/Argentina/Rio_Gallegos'] = 'America/Argentina/Rio_Gallegos';
+$a->strings['America/Argentina/Salta'] = 'America/Argentina/Salta';
 $a->strings['America/Argentina/San_Juan'] = 'America/Argentina/San_Juan';
+$a->strings['America/Argentina/San_Luis'] = 'America/Argentina/San_Luis';
 $a->strings['America/Argentina/Tucuman'] = 'America/Argentina/Tucuman';
 $a->strings['America/Argentina/Ushuaia'] = 'America/Argentina/Ushuaia';
 $a->strings['America/Aruba'] = 'America/Aruba';
@@ -701,7 +715,9 @@ $a->strings['America/Louisville'] = 'America/Louisville';
 $a->strings['America/Maceio'] = 'America/Maceio';
 $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';
@@ -720,6 +736,7 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
+$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@ -736,11 +753,14 @@ $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';
 $a->strings['America/Sao_Paulo'] = 'America/Sao_Paulo';
 $a->strings['America/Scoresbysund'] = 'America/Scoresbysund';
 $a->strings['America/Shiprock'] = 'America/Shiprock';
+$a->strings['America/St_Barthelemy'] = 'America/St_Barthelemy';
 $a->strings['America/St_Johns'] = 'America/St_Johns';
 $a->strings['America/St_Kitts'] = 'America/St_Kitts';
 $a->strings['America/St_Lucia'] = 'America/St_Lucia';
@@ -762,6 +782,7 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
 $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
 $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
 $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
+$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
 $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
 $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
 $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@ -798,6 +819,7 @@ $a->strings['Asia/Dubai'] = 'Asia/Dubai';
 $a->strings['Asia/Dushanbe'] = 'Asia/Dushanbe';
 $a->strings['Asia/Gaza'] = 'Asia/Gaza';
 $a->strings['Asia/Harbin'] = 'Asia/Harbin';
+$a->strings['Asia/Ho_Chi_Minh'] = 'Asia/Ho_Chi_Minh';
 $a->strings['Asia/Hong_Kong'] = 'Asia/Hong_Kong';
 $a->strings['Asia/Hovd'] = 'Asia/Hovd';
 $a->strings['Asia/Irkutsk'] = 'Asia/Irkutsk';
@@ -809,7 +831,9 @@ $a->strings['Asia/Kabul'] = 'Asia/Kabul';
 $a->strings['Asia/Kamchatka'] = 'Asia/Kamchatka';
 $a->strings['Asia/Karachi'] = 'Asia/Karachi';
 $a->strings['Asia/Kashgar'] = 'Asia/Kashgar';
+$a->strings['Asia/Kathmandu'] = 'Asia/Kathmandu';
 $a->strings['Asia/Katmandu'] = 'Asia/Katmandu';
+$a->strings['Asia/Kolkata'] = 'Asia/Kolkata';
 $a->strings['Asia/Krasnoyarsk'] = 'Asia/Krasnoyarsk';
 $a->strings['Asia/Kuala_Lumpur'] = 'Asia/Kuala_Lumpur';
 $a->strings['Asia/Kuching'] = 'Asia/Kuching';
@@ -821,6 +845,7 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
+$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';
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);
-- 
cgit v1.2.3


From 82bd1ce3cb0097ad6be9650e4a1414e819cf8b0c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 21 Mar 2011 03:33:58 -0700
Subject: installation issues

---
 util/strings.php | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'util')

diff --git a/util/strings.php b/util/strings.php
index 042a33569..31dffd162 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -65,30 +65,6 @@ $a->strings['Birthdays this week:'] = 'Birthdays this week:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
 $a->strings['[today]'] = '[today]';
 $a->strings['link to source'] = 'link to source';
-$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.';
-$a->strings['Wall Photos'] = 'Wall Photos';
-$a->strings['Message sent.'] = 'Message sent.';
-$a->strings['Message could not be sent.'] = 'Message could not be sent.';
-$a->strings['Messages'] = 'Messages';
-$a->strings['Inbox'] = 'Inbox';
-$a->strings['Outbox'] = 'Outbox';
-$a->strings['New Message'] = 'New Message';
-$a->strings['Message deleted.'] = 'Message deleted.';
-$a->strings['Conversation removed.'] = 'Conversation removed.';
-$a->strings['Send Private Message'] = 'Send Private Message';
-$a->strings['To:'] = 'To:';
-$a->strings['Subject:'] = 'Subject:';
-$a->strings['Your message:'] = 'Your message:';
-$a->strings['Upload photo'] = 'Upload photo';
-$a->strings['Insert web link'] = 'Insert web link';
-$a->strings['Please wait'] = 'Please wait';
-$a->strings['No messages.'] = 'No messages.';
-$a->strings['Delete conversation'] = 'Delete conversation';
-$a->strings['Message not available.'] = 'Message not available.';
-$a->strings['Delete message'] = 'Delete message';
-$a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Connect/Follow'] = 'Connect/Follow';
@@ -200,6 +176,7 @@ $a->strings['Private Message'] = 'Private Message';
 $a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
 $a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
 $a->strings['Share'] = 'Share';
+$a->strings['Please wait'] = 'Please wait';
 $a->strings['This is you'] = 'This is you';
 $a->strings['Edit'] = 'Edit';
 $a->strings['Delete'] = 'Delete';
@@ -212,6 +189,8 @@ $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
 $a->strings['Item not found'] = 'Item not found';
 $a->strings['Edit post'] = 'Edit post';
+$a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Insert web link'] = 'Insert web link';
 $a->strings['Insert YouTube video'] = 'Insert YouTube video';
 $a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
 $a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio';
@@ -262,6 +241,7 @@ $a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address
 $a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.';
 $a->strings['Send invitations'] = 'Send invitations';
 $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
+$a->strings['Your message:'] = 'Your message:';
 $a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:';
 $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:';
 $a->strings["%d message sent."] = array(
@@ -270,6 +250,7 @@ $a->strings["%d message sent."] = array(
 );
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
+$a->strings['Wall Photos'] = 'Wall Photos';
 $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
 $a->strings["Administrator"] = "Administrator";
 $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
@@ -287,9 +268,28 @@ $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['No recipient selected.'] = 'No recipient selected.';
+$a->strings['[no subject]'] = '[no subject]';
+$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
+$a->strings['Message sent.'] = 'Message sent.';
+$a->strings['Message could not be sent.'] = 'Message could not be sent.';
+$a->strings['Messages'] = 'Messages';
+$a->strings['Inbox'] = 'Inbox';
+$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:';
+$a->strings['No messages.'] = 'No messages.';
+$a->strings['Delete conversation'] = 'Delete conversation';
+$a->strings['Message not available.'] = 'Message not available.';
+$a->strings['Delete message'] = 'Delete message';
+$a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Please enter a link URL:'] = 'Please enter a link URL:';
 $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
 $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
 $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
@@ -449,7 +449,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:';
-- 
cgit v1.2.3


From 94cbf3bb80371d5b4160db8bef1d70f28f8a0d97 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 21 Mar 2011 04:10:08 -0700
Subject: another template down

---
 util/strings.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'util')

diff --git a/util/strings.php b/util/strings.php
index 31dffd162..907bfb6df 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -350,6 +350,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.';
-- 
cgit v1.2.3


From 93504896155d74fc42f6bf60cb61d65295f6b911 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 22 Mar 2011 08:16:40 +0100
Subject: Updated util/messages.po

---
 util/messages.po | 2283 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 1196 insertions(+), 1087 deletions(-)

(limited to 'util')

diff --git a/util/messages.po b/util/messages.po
index 44638bd9c..1c0c880e9 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-22 08:15+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,1316 +18,1323 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../index.php:187
-msgid "Not Found"
-msgstr ""
-
-#: ../../index.php:188
-msgid "Page not found."
-msgstr ""
-
-#: ../../index.php:243 ../../mod/group.php:88
-msgid "Permission denied"
-msgstr ""
-
-#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
+#: ../../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/regmod.php:16
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:224
-#: ../../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/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."
 msgstr ""
 
-#: ../../boot.php:808
-msgid "Create a New Account"
+#: ../../mod/network.php:18
+msgid "Normal View"
 msgstr ""
 
-#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
-msgid "Register"
+#: ../../mod/network.php:20
+msgid "New Item View"
 msgstr ""
 
-#: ../../boot.php:815
-msgid "Nickname or Email address: "
+#: ../../mod/network.php:69 ../../mod/message.php:172
+#: ../../mod/profile.php:137
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../boot.php:816
-msgid "Password: "
+#: ../../mod/network.php:70 ../../mod/profile.php:138
+msgid "Please enter a YouTube link:"
 msgstr ""
 
-#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
-msgid "Login"
+#: ../../mod/network.php:71 ../../mod/profile.php:139
+msgid "Please enter a video(.ogg) link/URL:"
 msgstr ""
 
-#: ../../boot.php:821
-msgid "Nickname/Email/OpenID: "
+#: ../../mod/network.php:72 ../../mod/profile.php:140
+msgid "Please enter an audio(.ogg) link/URL:"
 msgstr ""
 
-#: ../../boot.php:822
-msgid "Password (if not OpenID): "
+#: ../../mod/network.php:73 ../../mod/profile.php:141
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../boot.php:825
-msgid "Forgot your password?"
+#: ../../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"
 msgstr ""
 
-#: ../../boot.php:826
-msgid "Password Reset"
+#: ../../mod/network.php:97 ../../mod/message.php:186
+#: ../../mod/message.php:320 ../../mod/profile.php:165
+#: ../../mod/editpost.php:63
+msgid "Upload photo"
 msgstr ""
 
-#: ../../boot.php:837 ../../include/nav.php:38
-msgid "Logout"
+#: ../../mod/network.php:98 ../../mod/message.php:187
+#: ../../mod/message.php:321 ../../mod/profile.php:166
+#: ../../mod/editpost.php:64
+msgid "Insert web link"
 msgstr ""
 
-#: ../../boot.php:1077
-msgid "prev"
+#: ../../mod/network.php:99 ../../mod/profile.php:167
+#: ../../mod/editpost.php:65
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../boot.php:1079
-msgid "first"
+#: ../../mod/network.php:100 ../../mod/profile.php:168
+#: ../../mod/editpost.php:66
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../boot.php:1108
-msgid "last"
+#: ../../mod/network.php:101 ../../mod/profile.php:169
+#: ../../mod/editpost.php:67
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../boot.php:1111
-msgid "next"
+#: ../../mod/network.php:102 ../../mod/profile.php:170
+#: ../../mod/editpost.php:68
+msgid "Set your location"
 msgstr ""
 
-#: ../../boot.php:1831
-#, php-format
-msgid "%s likes this."
+#: ../../mod/network.php:103 ../../mod/profile.php:171
+#: ../../mod/editpost.php:69
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../boot.php:1831
-#, php-format
-msgid "%s doesn't like this."
+#: ../../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"
 msgstr ""
 
-#: ../../boot.php:1835
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
+#: ../../mod/network.php:105 ../../mod/profile.php:173
+#: ../../mod/editpost.php:71
+msgid "Permission settings"
 msgstr ""
 
-#: ../../boot.php:1837
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
+#: ../../mod/network.php:111 ../../mod/profile.php:180
+#: ../../mod/editpost.php:77
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../boot.php:1843
-msgid "and"
+#: ../../mod/network.php:113 ../../mod/profile.php:182
+#: ../../mod/editpost.php:79
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../boot.php:1846
-#, php-format
-msgid ", and %d other people"
+#: ../../mod/network.php:156
+msgid "No such group"
 msgstr ""
 
-#: ../../boot.php:1847
-#, php-format
-msgid "%s like this."
+#: ../../mod/network.php:167
+msgid "Group is empty"
 msgstr ""
 
-#: ../../boot.php:1847
-#, php-format
-msgid "%s don't like this."
+#: ../../mod/network.php:171
+msgid "Group: "
 msgstr ""
 
-#: ../../boot.php:2008
-msgid "No contacts"
+#: ../../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"
 msgstr ""
 
-#: ../../boot.php:2016 ../../mod/contacts.php:303
-#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
-#: ../../include/nav.php:111
-msgid "Contacts"
+#: ../../mod/network.php:295 ../../mod/search.php:131
+msgid "View in context"
 msgstr ""
 
-#: ../../boot.php:2032 ../../mod/viewcontacts.php:17
-msgid "View Contacts"
+#: ../../mod/network.php:329 ../../mod/display.php:149
+#: ../../mod/photos.php:962 ../../mod/profile.php:316
+msgid "Private Message"
 msgstr ""
 
-#: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67
-msgid "Search"
+#: ../../mod/network.php:373 ../../mod/display.php:156
+#: ../../mod/photos.php:1084 ../../mod/profile.php:323
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../boot.php:2204 ../../mod/profile.php:8
-msgid "No profile"
+#: ../../mod/network.php:374 ../../mod/display.php:157
+#: ../../mod/photos.php:1085 ../../mod/profile.php:324
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../boot.php:2261
-msgid "Connect"
+#: ../../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"
 msgstr ""
 
-#: ../../boot.php:2271
-msgid "Location:"
+#: ../../mod/network.php:397 ../../mod/display.php:222
+#: ../../mod/profile.php:362 ../../mod/editpost.php:62
+msgid "Edit"
 msgstr ""
 
-#: ../../boot.php:2275
-msgid ", "
+#: ../../mod/network.php:398 ../../mod/display.php:238
+#: ../../mod/photos.php:1203 ../../mod/profile.php:384 ../../mod/group.php:137
+msgid "Delete"
 msgstr ""
 
-#: ../../boot.php:2283
-msgid "Gender:"
+#: ../../mod/network.php:447 ../../mod/display.php:263
+msgid "View $owner_name's profile"
 msgstr ""
 
-#: ../../boot.php:2287
-msgid "Status:"
+#: ../../mod/network.php:448 ../../mod/display.php:264
+msgid "to"
 msgstr ""
 
-#: ../../boot.php:2289
-msgid "Homepage:"
+#: ../../mod/network.php:449 ../../mod/display.php:265
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Monday"
+#: ../../mod/network.php:450 ../../mod/display.php:266
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Tuesday"
+#: ../../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."
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Wednesday"
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Thursday"
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Friday"
+#: ../../mod/profiles.php:199
+msgid "Profile updated."
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Saturday"
+#: ../../mod/profiles.php:254
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../boot.php:2380
-msgid "Sunday"
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "January"
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "February"
+#: ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "March"
+#: ../../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 ""
 
-#: ../../boot.php:2384
-msgid "April"
+#: ../../mod/profiles.php:380
+msgid "Age: "
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "May"
+#: ../../mod/profiles.php:422
+msgid "Profile Image"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "June"
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "July"
+#: ../../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"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "August"
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "September"
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
+msgid "Discard"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "October"
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
+msgid "Ignore"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "November"
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../boot.php:2384
-msgid "December"
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../boot.php:2413
-msgid "Birthdays this week:"
+#: ../../mod/notifications.php:105
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../boot.php:2414
-msgid "(Adjusted for local time)"
+#: ../../mod/notifications.php:105
+msgid "yes"
 msgstr ""
 
-#: ../../boot.php:2423
-msgid "[today]"
+#: ../../mod/notifications.php:105
+msgid "no"
 msgstr ""
 
-#: ../../boot.php:2620
-msgid "link to source"
+#: ../../mod/notifications.php:111
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/notifications.php:112
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/notifications.php:113
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+#: ../../mod/notifications.php:120
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/notifications.php:121
+msgid "Friend/Connect Request"
 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
-#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
-#: ../../addon/statusnet/statusnet.php:163
-#: ../../addon/statusnet/statusnet.php:189
-#: ../../addon/statusnet/statusnet.php:207
-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
-msgid "Submit"
+#: ../../mod/notifications.php:121
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/notifications.php:131
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:570
-msgid "Unable to process image."
+#: ../../mod/notifications.php:140
+msgid "No notifications."
 msgstr ""
 
-#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/item.php:184
-#: ../../mod/message.php:93
-msgid "Wall Photos"
+#: ../../mod/notifications.php:164
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
-#: ../../mod/photos.php:588
-msgid "Image upload failed."
+#: ../../mod/install.php:33
+msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../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:423 ../../mod/item.php:446
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350
-msgid "Administrator"
+#: ../../mod/install.php:38
+msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:179
-msgid "noreply"
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:237
-msgid "New mail received at "
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
-#, php-format
-msgid "%s commented on an item at %s"
+#: ../../mod/install.php:75
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/profile.php:151 ../../mod/network.php:91
-msgid "Share"
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/profile.php:152 ../../mod/network.php:92
-#: ../../mod/message.php:185 ../../mod/message.php:319
-msgid "Upload photo"
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/profile.php:153 ../../mod/network.php:93
-#: ../../mod/message.php:186 ../../mod/message.php:320
-msgid "Insert web link"
+#: ../../mod/install.php:84
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/profile.php:154 ../../mod/network.php:94
-msgid "Insert YouTube video"
+#: ../../mod/install.php:85
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/profile.php:155 ../../mod/network.php:95
-msgid "Set your location"
+#: ../../mod/install.php:98
+msgid "Welcome to Friendika."
 msgstr ""
 
-#: ../../mod/profile.php:156 ../../mod/network.php:96
-msgid "Clear browser location"
+#: ../../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"
 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
-msgid "Please wait"
+#: ../../mod/install.php:138
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/profile.php:158 ../../mod/network.php:98
-msgid "Permission settings"
+#: ../../mod/install.php:139
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
 msgstr ""
 
-#: ../../mod/profile.php:165 ../../mod/network.php:104
-msgid "CC: email addresses"
+#: ../../mod/install.php:146
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/profile.php:167 ../../mod/network.php:106
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/install.php:147
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/profile.php:300 ../../mod/photos.php:935
-#: ../../mod/display.php:149 ../../mod/network.php:321
-msgid "Private Message"
+#: ../../mod/install.php:169
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/profile.php:307 ../../mod/photos.php:1050
-#: ../../mod/display.php:156 ../../mod/network.php:365
-msgid "I like this (toggle)"
+#: ../../mod/install.php:170
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/profile.php:308 ../../mod/photos.php:1051
-#: ../../mod/display.php:157 ../../mod/network.php:366
-msgid "I don't like this (toggle)"
+#: ../../mod/install.php:179
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 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
-msgid "This is you"
+#: ../../mod/install.php:181
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profile.php:361 ../../mod/photos.php:1168
-#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137
-msgid "Delete"
+#: ../../mod/install.php:183
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/profile.php:382 ../../mod/search.php:116
-#: ../../mod/display.php:258 ../../mod/network.php:272
-#: ../../mod/network.php:434
-msgid "View $name's profile"
+#: ../../mod/install.php:185
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profile.php:414 ../../mod/display.php:312
-#: ../../mod/register.php:422 ../../mod/network.php:471
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+#: ../../mod/install.php:187
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/follow.php:167
-msgid "The profile address specified does not provide adequate information."
+#: ../../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/follow.php:173
+#: ../../mod/install.php:199
 msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+"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/follow.php:224
-msgid "Unable to retrieve contact information."
+#: ../../mod/install.php:200
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
 msgstr ""
 
-#: ../../mod/follow.php:270
-msgid "following"
+#: ../../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/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../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/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/register.php:274 ../../mod/register.php:281
-msgid "Profile Photos"
+#: ../../mod/install.php:225
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../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/message.php:18
+msgid "No recipient selected."
 msgstr ""
 
-#: ../../mod/profile_photo.php:95
-msgid "Unable to process image"
+#: ../../mod/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../mod/profile_photo.php:228
-msgid "Image uploaded successfully."
+#: ../../mod/message.php:34
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/home.php:23
-#, php-format
-msgid "Welcome to %s"
+#: ../../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"
 msgstr ""
 
-#: ../../mod/regmod.php:10
-msgid "Please login."
+#: ../../mod/message.php:102
+msgid "Message sent."
 msgstr ""
 
-#: ../../mod/regmod.php:54
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/message.php:105
+msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/regmod.php:92 ../../mod/register.php:310
-#, php-format
-msgid "Registration details for %s"
+#: ../../mod/message.php:125 ../../include/nav.php:100
+msgid "Messages"
 msgstr ""
 
-#: ../../mod/regmod.php:96
-msgid "Account approved."
+#: ../../mod/message.php:126
+msgid "Inbox"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:234
-#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/message.php:127
+msgid "Outbox"
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/message.php:128
+msgid "New Message"
 msgstr ""
 
-#: ../../mod/profiles.php:196
-msgid "Profile updated."
+#: ../../mod/message.php:142
+msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:251
-msgid "Profile deleted."
+#: ../../mod/message.php:158
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/profiles.php:267 ../../mod/profiles.php:298
-msgid "Profile-"
+#: ../../mod/message.php:178
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/profiles.php:286 ../../mod/profiles.php:325
-msgid "New profile created."
+#: ../../mod/message.php:179 ../../mod/message.php:313
+msgid "To:"
 msgstr ""
 
-#: ../../mod/profiles.php:304
-msgid "Profile unavailable to clone."
+#: ../../mod/message.php:180 ../../mod/message.php:314
+msgid "Subject:"
 msgstr ""
 
-#: ../../mod/profiles.php:367
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/profiles.php:377
-msgid "Age: "
+#: ../../mod/message.php:222
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/profiles.php:418
-msgid "Profile Image"
+#: ../../mod/message.php:235
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/settings.php:37
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/message.php:265
+msgid "Message not available."
 msgstr ""
 
-#: ../../mod/settings.php:42
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/message.php:302
+msgid "Delete message"
 msgstr ""
 
-#: ../../mod/settings.php:53
-msgid "Password changed."
+#: ../../mod/message.php:312
+msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/settings.php:55
-msgid "Password update failed. Please try again."
+#: ../../mod/directory.php:32
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/settings.php:95
-msgid " Please use a shorter name."
+#: ../../mod/directory.php:38 ../../mod/contacts.php:315
+msgid "Finding: "
 msgstr ""
 
-#: ../../mod/settings.php:97
-msgid " Name too short."
+#: ../../mod/manage.php:37
+#, php-format
+msgid "Welcome back %s"
 msgstr ""
 
-#: ../../mod/settings.php:103
-msgid " Not valid email."
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/settings.php:105
-msgid " Cannot change to that email."
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
 msgstr ""
 
-#: ../../mod/settings.php:161
-msgid "Settings updated."
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/settings.php:211
-msgid "Plugin Settings"
+#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
+#, php-format
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../mod/settings.php:212
-msgid "Account Settings"
+#: ../../mod/dfrn_confirm.php:114 ../../mod/contacts.php:214
+msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/settings.php:218
-msgid "No Plugin settings configured"
+#: ../../mod/dfrn_confirm.php:231
+msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/settings.php:263
-msgid "OpenID: "
+#: ../../mod/dfrn_confirm.php:240
+msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/settings.php:263
-msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
+#: ../../mod/dfrn_confirm.php:248
+msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/settings.php:295
-msgid "Profile is <strong>not published</strong>."
+#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
+#: ../../mod/dfrn_confirm.php:271
+msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/settings.php:352
-msgid "Default Post Permissions"
+#: ../../mod/dfrn_confirm.php:262
+msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/search.php:131 ../../mod/network.php:287
-msgid "View in context"
+#: ../../mod/dfrn_confirm.php:269
+msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/photos.php:30
-msgid "Photo Albums"
+#: ../../mod/dfrn_confirm.php:387
+msgid "Unable to set contact photo."
 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
-#: ../../include/Photo.php:232 ../../include/Photo.php:239
-#: ../../include/items.php:959 ../../include/items.php:962
-#: ../../include/items.php:965
-msgid "Contact Photos"
+#: ../../mod/dfrn_confirm.php:426
+msgid "is now friends with"
 msgstr ""
 
-#: ../../mod/photos.php:95
-msgid "Contact information unavailable"
+#: ../../mod/dfrn_confirm.php:494
+#, php-format
+msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/photos.php:116
-msgid "Album not found."
+#: ../../mod/dfrn_confirm.php:504
+msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:858
-msgid "Delete Album"
+#: ../../mod/dfrn_confirm.php:515
+msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1033
-msgid "Delete Photo"
+#: ../../mod/dfrn_confirm.php:527
+msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/photos.php:468
-msgid "was tagged in a"
+#: ../../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/photos.php:468 ../../mod/like.php:110
-msgid "photo"
+#: ../../mod/dfrn_confirm.php:566
+msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/photos.php:468
-msgid "by"
+#: ../../mod/dfrn_confirm.php:619
+msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306
-msgid "Image exceeds size limit of "
+#: ../../mod/dfrn_confirm.php:648
+#, php-format
+msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../mod/photos.php:660
-msgid "No photos selected"
+#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
+#, php-format
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/photos.php:807
-msgid "Upload Photos"
+#: ../../mod/wall_upload.php:65 ../../mod/photos.php:571
+#: ../../mod/profile_photo.php:118
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:810 ../../mod/photos.php:853
-msgid "New album name: "
+#: ../../mod/wall_upload.php:82 ../../mod/photos.php:589
+#: ../../mod/profile_photo.php:230
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:811
-msgid "or existing album name: "
+#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/photos.php:813 ../../mod/photos.php:1028
-msgid "Permissions"
+#: ../../mod/display.php:305
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/photos.php:868
-msgid "Edit Album"
+#: ../../mod/match.php:10
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/photos.php:878 ../../mod/photos.php:1228
-msgid "View Photo"
+#: ../../mod/match.php:49
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/photos.php:908
-msgid "Photo not available"
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/photos.php:929
-msgid "Edit photo"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/photos.php:931
-msgid "Use as profile photo"
+#: ../../mod/dfrn_notify.php:179
+msgid "noreply"
 msgstr ""
 
-#: ../../mod/photos.php:944
-msgid "View Full Size"
+#: ../../mod/dfrn_notify.php:237
+msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/photos.php:1002
-msgid "Tags: "
+#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/photos.php:1012
-msgid "[Remove any tag]"
+#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/photos.php:1021
-msgid "New album name"
+#: ../../mod/removeme.php:43
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: ../../mod/photos.php:1024
-msgid "Caption"
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/photos.php:1026
-msgid "Add a Tag"
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/photos.php:1030
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/regmod.php:10
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/photos.php:1214
-msgid "Recent Photos"
+#: ../../mod/regmod.php:54
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/photos.php:1218
-msgid "Upload New Photos"
+#: ../../mod/regmod.php:92 ../../mod/register.php:310
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/photos.php:1234
-msgid "View Album"
+#: ../../mod/regmod.php:96
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
-msgid "Item not found."
+#: ../../mod/apps.php:6
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/display.php:259 ../../mod/network.php:435
-msgid "View $owner_name's profile"
+#: ../../mod/photos.php:30
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/display.php:260 ../../mod/network.php:436
-msgid "to"
-msgstr ""
-
-#: ../../mod/display.php:261 ../../mod/network.php:437
-msgid "Wall-to-Wall"
+#: ../../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:982 ../../include/items.php:985
+#: ../../include/items.php:988
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/display.php:262 ../../mod/network.php:438
-msgid "via Wall-To-Wall:"
+#: ../../mod/photos.php:95
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/display.php:300
-msgid "Item has been removed."
+#: ../../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/invite.php:28
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/photos.php:116
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/invite.php:32
-#, php-format
-msgid "Please join my network on %s"
+#: ../../mod/photos.php:134 ../../mod/photos.php:859
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/invite.php:38
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/photos.php:197 ../../mod/photos.php:1067
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/invite.php:42
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/photos.php:469
+msgid "was tagged in a"
+msgstr ""
 
-#: ../../mod/invite.php:57
-msgid "Send invitations"
+#: ../../mod/photos.php:469 ../../mod/like.php:110
+msgid "photo"
 msgstr ""
 
-#: ../../mod/invite.php:58
-msgid "Enter email addresses, one per line:"
+#: ../../mod/photos.php:469
+msgid "by"
 msgstr ""
 
-#: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316
-msgid "Your message:"
+#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/invite.php:60
-#, php-format
-msgid "Please join my social network on %s"
+#: ../../mod/photos.php:661
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/invite.php:61
-msgid "To accept this invitation, please visit:"
+#: ../../mod/photos.php:808
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/invite.php:62
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/photos.php:811 ../../mod/photos.php:854
+msgid "New album name: "
 msgstr ""
 
-#: ../../mod/contacts.php:12
-msgid "Invite Friends"
+#: ../../mod/photos.php:812
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/contacts.php:16
-msgid "Connect/Follow"
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062
+msgid "Permissions"
 msgstr ""
 
-#: ../../mod/contacts.php:17
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../mod/photos.php:869
+msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/contacts.php:18
-msgid "Follow"
+#: ../../mod/photos.php:879 ../../mod/photos.php:1263
+msgid "View Photo"
 msgstr ""
 
-#: ../../mod/contacts.php:38 ../../mod/contacts.php:119
-msgid "Could not access contact record."
+#: ../../mod/photos.php:909
+msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/contacts.php:52
-msgid "Could not locate selected profile."
+#: ../../mod/photos.php:956
+msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/contacts.php:83
-msgid "Contact updated."
+#: ../../mod/photos.php:958
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402
-msgid "Failed to update contact record."
+#: ../../mod/photos.php:969
+msgid "<< Prev"
 msgstr ""
 
-#: ../../mod/contacts.php:141
-msgid "Contact has been blocked"
+#: ../../mod/photos.php:973
+msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/contacts.php:141
-msgid "Contact has been unblocked"
+#: ../../mod/photos.php:977
+msgid "Next >>"
 msgstr ""
 
-#: ../../mod/contacts.php:155
-msgid "Contact has been ignored"
+#: ../../mod/photos.php:1036
+msgid "Tags: "
 msgstr ""
 
-#: ../../mod/contacts.php:155
-msgid "Contact has been unignored"
+#: ../../mod/photos.php:1046
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/contacts.php:176
-msgid "stopped following"
+#: ../../mod/photos.php:1055
+msgid "New album name"
 msgstr ""
 
-#: ../../mod/contacts.php:195
-msgid "Contact has been removed."
+#: ../../mod/photos.php:1058
+msgid "Caption"
 msgstr ""
 
-#: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
+#: ../../mod/photos.php:1060
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/contacts.php:223 ../../mod/contacts.php:344
-msgid "Mutual Friendship"
+#: ../../mod/photos.php:1064
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/contacts.php:227 ../../mod/contacts.php:348
-msgid "is a fan of yours"
+#: ../../mod/photos.php:1249
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:352
-msgid "you are a fan of"
+#: ../../mod/photos.php:1253
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:248
-msgid "Never"
+#: ../../mod/photos.php:1269
+msgid "View Album"
 msgstr ""
 
-#: ../../mod/contacts.php:252
-msgid "(Update was successful)"
+#: ../../mod/profile.php:8 ../../boot.php:2210
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/contacts.php:252
-msgid "(Update was not successful)"
+#: ../../mod/profile.php:102
+msgid "Status"
 msgstr ""
 
-#: ../../mod/contacts.php:255
-msgid "Contact Editor"
+#: ../../mod/profile.php:103
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/contacts.php:256
-msgid "Visit $name's profile"
+#: ../../mod/profile.php:104
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:257
-msgid "Block/Unblock contact"
+#: ../../mod/viewcontacts.php:17 ../../boot.php:2038
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:258
-msgid "Ignore contact"
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/contacts.php:259
-msgid "Delete contact"
+#: ../../mod/viewcontacts.php:44 ../../mod/contacts.php:376
+msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:261
-msgid "Last updated: "
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/contacts.php:262
-msgid "Update public posts: "
+#: ../../mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/contacts.php:264
-msgid "Update now"
+#: ../../mod/settings.php:37
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "Unblock this contact"
+#: ../../mod/settings.php:42
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "Block this contact"
+#: ../../mod/settings.php:53
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/contacts.php:268
-msgid "Unignore this contact"
+#: ../../mod/settings.php:55
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/contacts.php:268
-msgid "Ignore this contact"
+#: ../../mod/settings.php:97
+msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/contacts.php:271
-msgid "Currently blocked"
+#: ../../mod/settings.php:99
+msgid " Name too short."
 msgstr ""
 
-#: ../../mod/contacts.php:272
-msgid "Currently ignored"
+#: ../../mod/settings.php:105
+msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/contacts.php:305
-msgid "Show Blocked Connections"
+#: ../../mod/settings.php:107
+msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/contacts.php:305
-msgid "Hide Blocked Connections"
+#: ../../mod/settings.php:165
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/contacts.php:307 ../../mod/directory.php:38
-msgid "Finding: "
+#: ../../mod/settings.php:215
+msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:308
-msgid "Find"
+#: ../../mod/settings.php:216
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44
-msgid "Visit $username's profile"
+#: ../../mod/settings.php:222
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/contacts.php:369
-msgid "Edit contact"
+#: ../../mod/settings.php:269
+msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/settings.php:269
+msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/settings.php:301
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/register.php:47
-msgid "Invalid OpenID url"
+#: ../../mod/settings.php:358
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/register.php:62
-msgid "Please enter the required information."
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/register.php:74
-msgid "Please use a shorter name."
+#: ../../mod/item.php:126
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/register.php:76
-msgid "Name too short."
+#: ../../mod/item.php:474
+#, php-format
+msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/register.php:89
-msgid "That doesn\\'t appear to be your full (First Last) name."
+#: ../../mod/item.php:497
+#, php-format
+msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/register.php:92
-msgid "Your email domain is not among those allowed on this site."
+#: ../../mod/item.php:523
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/register.php:95
-msgid "Not a valid email address."
+#: ../../mod/item.php:541
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/register.php:101
-msgid "Cannot use that email."
+#: ../../mod/item.php:543
+msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/item.php:545
 msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/register.php:112
-msgid "Nickname is already registered. Please choose another."
+#: ../../mod/item.php:547
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/register.php:131
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2055
+msgid "Search"
 msgstr ""
 
-#: ../../mod/register.php:198
-msgid "An error occurred during registration. Please try again."
+#: ../../mod/search.php:54
+msgid "No results."
 msgstr ""
 
-#: ../../mod/register.php:216
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/register.php:315
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: ../../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."
 msgstr ""
 
-#: ../../mod/register.php:319
-msgid "Failed to send email message. Here is the message that failed."
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/register.php:324
-msgid "Your registration can not be processed."
+#: ../../mod/profile_photo.php:228
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/register.php:347
-#, php-format
-msgid "Registration request at %s"
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/register.php:351
-msgid "Your registration is pending approval by the site owner."
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/register.php:399
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+#: ../../mod/group.php:43 ../../mod/group.php:123
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/register.php:400
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: ../../mod/group.php:56
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/register.php:401
-msgid "Your OpenID (optional): "
+#: ../../mod/group.php:79
+msgid "Membership list updated."
 msgstr ""
 
-#: ../../mod/register.php:404
-msgid ""
-"Members of this network prefer to communicate with real people who use their "
-"real names."
+#: ../../mod/group.php:88 ../../index.php:250
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/register.php:413
-msgid "Include your profile in member directory?"
+#: ../../mod/group.php:107
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
-msgid "Yes"
+#: ../../mod/group.php:109
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
-msgid "No"
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
 msgstr ""
 
-#: ../../mod/register.php:429
-msgid "Registration"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../mod/register.php:437
-msgid "Your Full Name (e.g. Joe Smith): "
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../mod/register.php:438
-msgid "Your Email Address: "
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/register.php:439
-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>'."
+#: ../../mod/tagrm.php:93
+msgid "Remove"
 msgstr ""
 
-#: ../../mod/register.php:440
-msgid "Choose a nickname: "
+#: ../../mod/invite.php:28
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/install.php:30
-msgid "Could not create/connect to database."
+#: ../../mod/invite.php:32
+#, php-format
+msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../mod/install.php:35
-msgid "Connected to database."
+#: ../../mod/invite.php:38
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/install.php:66
-msgid "Database import succeeded."
-msgstr ""
+#: ../../mod/invite.php:42
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/install.php:67
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/invite.php:57
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/install.php:73
-msgid "Database import failed."
+#: ../../mod/invite.php:60
+#, php-format
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/install.php:74
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/install.php:84
-msgid "Welcome to Friendika."
+#: ../../mod/invite.php:62
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/install.php:124
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/register.php:47
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/install.php:125
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
+#: ../../mod/register.php:62
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/install.php:132
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/register.php:74
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/install.php:133
-msgid "This is required for message delivery to work."
+#: ../../mod/register.php:76
+msgid "Name too short."
 msgstr ""
 
-#: ../../mod/install.php:155
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/register.php:89
+msgid "That doesn\\'t appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/install.php:156
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/register.php:92
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/install.php:165
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/register.php:95
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/install.php:167
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/register.php:101
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/install.php:169
+#: ../../mod/register.php:106
 msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../mod/install.php:171
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/register.php:112
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/install.php:173
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/register.php:131
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/install.php:184
-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/register.php:198
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/install.php:185
-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/register.php:216
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/install.php:186
+#: ../../mod/register.php:315
 msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/install.php:187
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+#: ../../mod/register.php:319
+msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/install.php:196
-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/register.php:324
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/install.php:211
-msgid "Errors encountered creating database tables."
+#: ../../mod/register.php:347
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/network.php:18
-msgid "Normal View"
+#: ../../mod/register.php:351
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/network.php:20
-msgid "New Item View"
+#: ../../mod/register.php:399
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/network.php:149
-msgid "No such group"
+#: ../../mod/register.php:400
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/network.php:160
-msgid "Group is empty"
+#: ../../mod/register.php:401
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/network.php:164
-msgid "Group: "
+#: ../../mod/register.php:415
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/notifications.php:28
-msgid "Invalid request identifier."
+#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
-msgid "Discard"
+#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619
+msgid "No"
 msgstr ""
 
-#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
-msgid "Ignore"
+#: ../../mod/register.php:431
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Show Ignored Requests"
+#: ../../mod/register.php:439
+msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Hide Ignored Requests"
+#: ../../mod/register.php:440
+msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "Claims to be known to you: "
+#: ../../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/notifications.php:105
-msgid "yes"
+#: ../../mod/register.php:442
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "no"
+#: ../../mod/register.php:445 ../../include/nav.php:61 ../../boot.php:809
+msgid "Register"
 msgstr ""
 
-#: ../../mod/notifications.php:111
-msgid "Approve as: "
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
 msgstr ""
 
-#: ../../mod/notifications.php:112
-msgid "Friend"
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
 msgstr ""
 
-#: ../../mod/notifications.php:113
-msgid "Fan/Admirer"
+#: ../../mod/like.php:110
+msgid "status"
 msgstr ""
 
-#: ../../mod/notifications.php:120
-msgid "Notification type: "
+#: ../../mod/like.php:127
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/notifications.php:121
-msgid "Friend/Connect Request"
+#: ../../mod/like.php:129
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/notifications.php:121
-msgid "New Follower"
+#: ../../mod/follow.php:173
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/notifications.php:131
-msgid "Approve"
+#: ../../mod/follow.php:179
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/notifications.php:140
-msgid "No notifications."
+#: ../../mod/follow.php:230
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/notifications.php:164
-msgid "No registrations."
+#: ../../mod/follow.php:276
+msgid "following"
 msgstr ""
 
 #: ../../mod/dfrn_request.php:92
@@ -1403,6 +1410,10 @@ 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 ""
@@ -1417,7 +1428,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 ""
 
@@ -1471,300 +1482,218 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
-msgid "Cancel"
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../mod/like.php:110
-msgid "status"
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
 msgstr ""
 
-#: ../../mod/like.php:127
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../mod/contacts.php:19
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../mod/like.php:129
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../mod/contacts.php:20
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../mod/lostpass.php:38
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/contacts.php:21
+msgid "Follow"
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/contacts.php:57
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../mod/contacts.php:88
+msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/apps.php:6
-msgid "Applications"
+#: ../../mod/contacts.php:146
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/directory.php:32
-msgid "Global Directory"
+#: ../../mod/contacts.php:146
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/item.php:37
-msgid "Unable to locate original post."
+#: ../../mod/contacts.php:160
+msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/item.php:98
-msgid "Empty post discarded."
+#: ../../mod/contacts.php:160
+msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/item.php:422
-#, php-format
-msgid "%s commented on your item at %s"
+#: ../../mod/contacts.php:181
+msgid "stopped following"
 msgstr ""
 
-#: ../../mod/item.php:445
-#, php-format
-msgid "%s posted on your profile wall at %s"
+#: ../../mod/contacts.php:200
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/item.php:471
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../mod/item.php:489
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendika social network."
-msgstr ""
-
-#: ../../mod/item.php:491
-msgid "You may visit them online at"
-msgstr ""
-
-#: ../../mod/item.php:493
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-
-#: ../../mod/item.php:495
-#, php-format
-msgid "%s posted an update."
-msgstr ""
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/message.php:18
-msgid "No recipient selected."
-msgstr ""
-
-#: ../../mod/message.php:23
-msgid "[no subject]"
-msgstr ""
-
-#: ../../mod/message.php:34
-msgid "Unable to locate contact information."
-msgstr ""
-
-#: ../../mod/message.php:102
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/message.php:105
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:125 ../../include/nav.php:100
-msgid "Messages"
-msgstr ""
-
-#: ../../mod/message.php:126
-msgid "Inbox"
-msgstr ""
-
-#: ../../mod/message.php:127
-msgid "Outbox"
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
+msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/message.php:128
-msgid "New Message"
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
+msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/message.php:142
-msgid "Message deleted."
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
+msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/message.php:158
-msgid "Conversation removed."
+#: ../../mod/contacts.php:252
+msgid "Privacy Unavailable"
 msgstr ""
 
-#: ../../mod/message.php:177
-msgid "Send Private Message"
+#: ../../mod/contacts.php:253
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/message.php:178 ../../mod/message.php:312
-msgid "To:"
+#: ../../mod/contacts.php:256
+msgid "Never"
 msgstr ""
 
-#: ../../mod/message.php:179 ../../mod/message.php:313
-msgid "Subject:"
+#: ../../mod/contacts.php:260
+msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/message.php:221
-msgid "No messages."
+#: ../../mod/contacts.php:260
+msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/message.php:234
-msgid "Delete conversation"
+#: ../../mod/contacts.php:263
+msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/message.php:264
-msgid "Message not available."
+#: ../../mod/contacts.php:264
+msgid "Visit $name's profile"
 msgstr ""
 
-#: ../../mod/message.php:301
-msgid "Delete message"
+#: ../../mod/contacts.php:265
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/message.php:311
-msgid "Send Reply"
+#: ../../mod/contacts.php:266
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:231
-msgid "Response from remote site was not understood."
+#: ../../mod/contacts.php:267
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:240
-msgid "Unexpected response from remote site: "
+#: ../../mod/contacts.php:269
+msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:248
-msgid "Confirmation completed successfully."
+#: ../../mod/contacts.php:270
+msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
-#: ../../mod/dfrn_confirm.php:271
-msgid "Remote site reported: "
+#: ../../mod/contacts.php:272
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:262
-msgid "Temporary failure. Please wait and try again."
+#: ../../mod/contacts.php:275
+msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:269
-msgid "Introduction failed or was revoked."
+#: ../../mod/contacts.php:275
+msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:387
-msgid "Unable to set contact photo."
+#: ../../mod/contacts.php:276
+msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:426
-msgid "is now friends with"
+#: ../../mod/contacts.php:276
+msgid "Ignore this contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:494
-#, php-format
-msgid "No user record found for '%s' "
+#: ../../mod/contacts.php:279
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:504
-msgid "Our site encryption key is apparently messed up."
+#: ../../mod/contacts.php:280
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:515
-msgid "Empty site URL was provided or URL could not be decrypted by us."
+#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140
+#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
+#: ../../boot.php:2022
+msgid "Contacts"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:527
-msgid "Contact record was not found for you on our site."
+#: ../../mod/contacts.php:313
+msgid "Show Blocked Connections"
 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."
+#: ../../mod/contacts.php:313
+msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:566
-msgid "Unable to set your contact credentials on our system."
+#: ../../mod/contacts.php:316
+msgid "Find"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
-msgid "Unable to update your contact profile details on our system"
+#: ../../mod/contacts.php:377
+msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:648
-#, php-format
-msgid "Connection accepted at %s"
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
-#: ../../include/auth.php:130 ../../include/auth.php:183
-msgid "Login failed."
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../mod/openid.php:73 ../../include/auth.php:194
-msgid "Welcome back "
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
-#, php-format
-msgid "%s welcomes %s"
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:32
-msgid "No contacts."
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
 msgstr ""
 
-#: ../../mod/group.php:79
-msgid "Membership list updated."
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
 msgstr ""
 
-#: ../../mod/group.php:107
-msgid "Group removed."
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
 msgstr ""
 
-#: ../../mod/group.php:109
-msgid "Unable to remove group."
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
 msgstr ""
 
 #: ../../addon/twitter/twitter.php:64
@@ -1816,61 +1745,6 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:78
-msgid "Post to StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:146
-msgid "StatusNet Posting Settings"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:152
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendika Account as "
-"an desktop client on your StatusNet account, copy the consumer key pair here "
-"and enter the API base root.<br />Before you register your own OAuth key "
-"pair ask the administrator if there is already a key pair for this Friendika "
-"installation at your favorited StatusNet installation."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:154
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:157
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:160
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:181
-msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below "
-"and submit the form. Only your <strong>public</strong> posts will be posted "
-"to StatusNet."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:182
-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 ""
-
 #: ../../addon/tictac/tictac.php:14
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
@@ -1925,65 +1799,8 @@ msgstr ""
 msgid "I won!"
 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/facebook/facebook.php:116
-msgid "Facebook disabled"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:124
-msgid "Facebook API key is missing."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:131
-msgid "Facebook Connect"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:137
-msgid "Install Facebook post connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:144
-msgid "Remove Facebook post connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:150
-msgid "Post to Facebook by default"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:174
-msgid "Facebook"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:175
-msgid "Facebook Connector Settings"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:189
-msgid "Post to Facebook"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:230
-msgid "Image: "
-msgstr ""
-
-#: ../../addon/randplace/randplace.php:171
-msgid "Randplace Settings"
-msgstr ""
-
-#: ../../addon/randplace/randplace.php:173
-msgid "Enable Randplace Plugin"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:39
-msgid "Upload a file"
+#: ../../addon/js_upload/js_upload.php:39
+msgid "Upload a file"
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:40
@@ -2014,52 +1831,92 @@ msgstr ""
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
+#: ../../addon/java_upload/java_upload.php:33
+msgid "Select files to upload: "
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
+#: ../../addon/java_upload/java_upload.php:35
+msgid ""
+"Use the following controls only if the Java uploader [above] fails to launch."
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: ../../addon/statusnet/statusnet.php:78
+msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: ../../addon/statusnet/statusnet.php:146
+msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
+#: ../../addon/statusnet/statusnet.php:152
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendika Account as "
+"an desktop client on your StatusNet account, copy the consumer key pair here "
+"and enter the API base root.<br />Before you register your own OAuth key "
+"pair ask the administrator if there is already a key pair for this Friendika "
+"installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
+#: ../../addon/statusnet/statusnet.php:154
+msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../include/contact_selectors.php:55
-msgid "Frequently"
+#: ../../addon/statusnet/statusnet.php:157
+msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Hourly"
+#: ../../addon/statusnet/statusnet.php:160
+msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Twice daily"
+#: ../../addon/statusnet/statusnet.php:181
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below "
+"and submit the form. Only your <strong>public</strong> posts will be posted "
+"to StatusNet."
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Daily"
+#: ../../addon/statusnet/statusnet.php:182
+msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Weekly"
+#: ../../addon/statusnet/statusnet.php:184
+msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Monthly"
+#: ../../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
@@ -2274,20 +2131,112 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/acl_selectors.php:132
-msgid "Visible To:"
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
-msgid "Groups"
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
 msgstr ""
 
-#: ../../include/acl_selectors.php:147
-msgid "Except For:"
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/auth.php:27
-msgid "Logged out."
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr ""
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr ""
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr ""
+
+#: ../../include/contact_selectors.php:55
+msgid "Frequently"
+msgstr ""
+
+#: ../../include/contact_selectors.php:56
+msgid "Hourly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:57
+msgid "Twice daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:58
+msgid "Daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:59
+msgid "Weekly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:60
+msgid "Monthly"
+msgstr ""
+
+#: ../../include/nav.php:38 ../../boot.php:837
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:44 ../../boot.php:817 ../../boot.php:823
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:56 ../../include/nav.php:91
+msgid "Home"
+msgstr ""
+
+#: ../../include/nav.php:64
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:77
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:87
+msgid "Network"
+msgstr ""
+
+#: ../../include/nav.php:96
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:104
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:107
+msgid "Settings"
+msgstr ""
+
+#: ../../include/nav.php:109
+msgid "Profiles"
+msgstr ""
+
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/items.php:1027
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/items.php:1371
+msgid "You have a new follower at "
+msgstr ""
+
+#: ../../include/group.php:130
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/group.php:131
+msgid "Everybody"
 msgstr ""
 
 #: ../../include/datetime.php:44 ../../include/datetime.php:46
@@ -2358,54 +2307,214 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: ../../include/nav.php:56 ../../include/nav.php:91
-msgid "Home"
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/nav.php:64
-msgid "Apps"
+#: ../../boot.php:808
+msgid "Create a New Account"
 msgstr ""
 
-#: ../../include/nav.php:77
-msgid "Directory"
+#: ../../boot.php:815
+msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../include/nav.php:87
-msgid "Network"
+#: ../../boot.php:816
+msgid "Password: "
 msgstr ""
 
-#: ../../include/nav.php:96
-msgid "Notifications"
+#: ../../boot.php:821
+msgid "Nickname/Email/OpenID: "
 msgstr ""
 
-#: ../../include/nav.php:104
-msgid "Manage"
+#: ../../boot.php:822
+msgid "Password (if not OpenID): "
 msgstr ""
 
-#: ../../include/nav.php:107
-msgid "Settings"
+#: ../../boot.php:825
+msgid "Forgot your password?"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Profiles"
+#: ../../boot.php:826
+msgid "Password Reset"
 msgstr ""
 
-#: ../../include/items.php:1004
-msgid "Birthday:"
+#: ../../boot.php:1077
+msgid "prev"
 msgstr ""
 
-#: ../../include/items.php:1348
-msgid "You have a new follower at "
+#: ../../boot.php:1079
+msgid "first"
 msgstr ""
 
-#: ../../include/group.php:130
-msgid "Create a new group"
+#: ../../boot.php:1108
+msgid "last"
 msgstr ""
 
-#: ../../include/group.php:131
-msgid "Everybody"
+#: ../../boot.php:1111
+msgid "next"
 msgstr ""
 
-#: ../../include/oembed.php:57
-msgid "Embedding disabled"
+#: ../../boot.php:1837
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../boot.php:1837
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../boot.php:1841
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr ""
+
+#: ../../boot.php:1843
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr ""
+
+#: ../../boot.php:1849
+msgid "and"
+msgstr ""
+
+#: ../../boot.php:1852
+#, php-format
+msgid ", and %d other people"
+msgstr ""
+
+#: ../../boot.php:1853
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../boot.php:1853
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../boot.php:2014
+msgid "No contacts"
+msgstr ""
+
+#: ../../boot.php:2267
+msgid "Connect"
+msgstr ""
+
+#: ../../boot.php:2277
+msgid "Location:"
+msgstr ""
+
+#: ../../boot.php:2281
+msgid ", "
+msgstr ""
+
+#: ../../boot.php:2289
+msgid "Gender:"
+msgstr ""
+
+#: ../../boot.php:2293
+msgid "Status:"
+msgstr ""
+
+#: ../../boot.php:2295
+msgid "Homepage:"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Monday"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Tuesday"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Wednesday"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Thursday"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Friday"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Saturday"
+msgstr ""
+
+#: ../../boot.php:2386
+msgid "Sunday"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "January"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "February"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "March"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "April"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "May"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "June"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "July"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "August"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "September"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "October"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "November"
+msgstr ""
+
+#: ../../boot.php:2390
+msgid "December"
+msgstr ""
+
+#: ../../boot.php:2424
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../boot.php:2425
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../boot.php:2426
+msgid "(Adjusted for local time)"
+msgstr ""
+
+#: ../../boot.php:2437
+msgid "[today]"
+msgstr ""
+
+#: ../../boot.php:2634
+msgid "link to source"
 msgstr ""
-- 
cgit v1.2.3