diff --git a/util/extract.php b/util/extract.php
index 92ec8501ce..90127f3c1b 100644
--- a/util/extract.php
+++ b/util/extract.php
@@ -10,25 +10,50 @@
 		$str = file_get_contents($file);
 
 		$pat = '| t\(([^\)]*)\)|';
+		$patt = '| tt\(([^\)]*)\)|';
 
 		preg_match_all($pat,$str,$matches);
+		preg_match_all($patt, $str, $matchestt);
+		
 
-		if(! count($matches))
-			continue;
-
-		foreach($matches[1] as $match) {
-			if(! in_array($match,$arr))
-				$arr[] = $match;
+		if(count($matches)){
+			foreach($matches[1] as $match) {
+				if(! in_array($match,$arr))
+					$arr[] = $match;
+			}
+		}
+		if(count($matchestt)){
+			foreach($matchestt[1] as $match) {
+				$matchtkns = preg_split("|[ \t\r\n]*,[ \t\r\n]*|",$match);
+				if (count($matchtkns)==3 && !in_array($matchtkns,$arr)){
+					$arr[] = $matchtkns;
+				}
+			}
 		}
 
 	}
 
 	$s = '<?php' . "\n";
-	foreach($arr as $a) {
-		if(substr($a,0,1) == '$')
-			continue;
+	$s .= '
+function string_plural_select($n){
+	return ($n != 1);
+}
 
-		$s .= '$a->strings[' . $a . '] = ' . $a . ';' . "\n";
+';
+
+	foreach($arr as $a) {
+		if (is_array($a)){
+			if(substr($a[1],0,1) == '$')
+				continue;
+			$s .= '$a->strings[' . $a[0] . "] = array(\n";
+			$s .= "\t0 => ". $a[0]. ",\n";
+			$s .= "\t1 => ". $a[1]. ",\n";
+			$s .= ");\n";
+		} else {
+			if(substr($a,0,1) == '$')
+				continue;			
+			$s .= '$a->strings[' . $a . '] = '. $a . ';' . "\n";
+		}
 	}
 
 	$zones = timezone_identifiers_list();
diff --git a/util/strings.php b/util/strings.php
index b010cb9fc0..395901b061 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -1,4 +1,9 @@
 <?php
+
+function string_plural_select($n){
+	return ($n != 1);
+}
+
 $a->strings['Not Found'] = 'Not Found';
 $a->strings['Page not found.' ] = 'Page not found.' ;
 $a->strings['Permission denied'] = 'Permission denied';
@@ -61,30 +66,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';
@@ -97,8 +78,10 @@ $a->strings['Failed to update contact record.'] = 'Failed to update contact reco
 $a->strings['Contact has been '] = 'Contact has been ';
 $a->strings['blocked'] = 'blocked';
 $a->strings['unblocked'] = 'unblocked';
-$a->strings['ignored'] = 'ignored';
-$a->strings['unignored'] = 'unignored';
+$a->strings['Contact has been blocked'] = 'Contact has been blocked';
+$a->strings['Contact has been unblocked'] = 'Contact has been unblocked';
+$a->strings['Contact has been ignored'] = 'Contact has been ignored';
+$a->strings['Contact has been unignored'] = 'Contact has been unignored';
 $a->strings['stopped following'] = 'stopped following';
 $a->strings['Contact has been removed.'] = 'Contact has been removed.';
 $a->strings['Contact not found.'] = 'Contact not found.';
@@ -126,8 +109,7 @@ $a->strings['Show Blocked Connections'] = 'Show Blocked Connections';
 $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections';
 $a->strings['Finding: '] = 'Finding: ';
 $a->strings['Find'] = 'Find';
-$a->strings['Visit '] = 'Visit ';
-$a->strings['\'s profile'] = '\'s profile';
+$a->strings['Visit $username\'s profile'] = 'Visit $username\'s profile';
 $a->strings['Edit contact'] = 'Edit contact';
 $a->strings['Profile not found.'] = 'Profile not found.';
 $a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
@@ -138,43 +120,38 @@ $a->strings["Temporary failure. Please wait and try again."] = "Temporary failur
 $a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
 $a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
 $a->strings['is now friends with'] = 'is now friends with';
-$a->strings['No user record found for '] = 'No user record found for ';
 $a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
 $a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
 $a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.';
 $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 "] = "Connection accepted at ";
 $a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
-$a->strings[' commented on an item at '] = ' commented on an item at ';
-$a->strings[" commented on an item at "] = " commented on an item at ";
-$a->strings[' welcomes '] = ' welcomes ';
+$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.';
 $a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.';
-$a->strings[' required parameter'] = ' required parameter';
-$a->strings[" was "] = " was ";
-$a->strings["s were "] = "s were ";
-$a->strings["not found at the given location."] = "not found at the given location.";
 $a->strings["Introduction complete."] = "Introduction complete.";
 $a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.';
 $a->strings['Profile unavailable.'] = 'Profile unavailable.';
-$a->strings[' has received too many connection requests today.'] = ' has received too many connection requests today.';
+$a->strings['%s has received too many connection requests today.'] = '%s has received too many connection requests today.';
 $a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.';
 $a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.';
 $a->strings["Invalid locator"] = "Invalid locator";
 $a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
 $a->strings['You have already introduced yourself here.'] = 'You have already introduced yourself here.';
-$a->strings['Apparently you are already friends with .'] = 'Apparently you are already friends with .';
+$a->strings['Apparently you are already friends with %s.'] = 'Apparently you are already friends with %s.';
 $a->strings['Invalid profile URL.'] = 'Invalid profile URL.';
 $a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.';
 $a->strings['Your introduction has been sent.'] = 'Your introduction has been sent.';
 $a->strings["Please login to confirm introduction."] = "Please login to confirm introduction.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
 $a->strings['[Name Withheld]'] = '[Name Withheld]';
+$a->strings["Introduction received at "] = "Introduction received at ";
 $a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
 $a->strings['Please answer the following:'] = 'Please answer the following:';
 $a->strings['Does $name know you?'] = 'Does $name know you?';
@@ -189,11 +166,16 @@ $a->strings["Public \x28insecure\x29 network"] = "Public \x28insecure\x29 networ
 $a->strings['Your profile address:'] = 'Your profile address:';
 $a->strings['Submit Request'] = 'Submit Request';
 $a->strings['Cancel'] = 'Cancel';
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d required parameter was not found at the given location",
+	1 => "%d required parameters were not found at the given location",
+);
 $a->strings['Global Directory'] = 'Global Directory';
 $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['This is you'] = 'This is you';
 $a->strings['Delete'] = 'Delete';
 $a->strings['View $name\'s profile'] = 'View $name\'s profile';
@@ -203,8 +185,6 @@ $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['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.';
@@ -216,7 +196,7 @@ $a->strings['Group name changed.'] = 'Group name changed.';
 $a->strings['Membership list updated.'] = 'Membership list updated.';
 $a->strings['Group removed.'] = 'Group removed.';
 $a->strings['Unable to remove group.'] = 'Unable to remove group.';
-$a->strings["Welcome to "] = "Welcome to ";
+$a->strings["Welcome to %s"] = "Welcome to %s";
 $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
 $a->strings['Connected to database.'] = 'Connected to database.';
 $a->strings['Database import succeeded.'] = 'Database import succeeded.';
@@ -243,38 +223,60 @@ $a->strings['Please check with your site documentation or support people to see
 $a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.';
 $a->strings['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.'] = '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.';
 $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
-$a->strings[' : '] = ' : ';
-$a->strings['Not a valid email address.'] = 'Not a valid email address.';
-$a->strings['Please join my network on '] = 'Please join my network on ';
-$a->strings['Message delivery failed.'] = 'Message delivery failed.';
-$a->strings[' messages sent.'] = ' messages sent.';
+$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['Please join my social network on '] = 'Please join my social network on ';
+$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(
+	0 => "%d message sent.",
+	1 => "%d messages sent.",
+);
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
-$a->strings[" commented on your item at "] = " commented on your item at ";
-$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
+$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['This message was sent to you by '] = 'This message was sent to you by ';
-$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
 $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['posted an update.'] = 'posted an update.';
+$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';
+$a->strings["%s's"] = "%s's";
 $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
 $a->strings['Visible to:'] = 'Visible to:';
-$a->strings['Password reset requested at '] = 'Password reset requested at ';
-$a->strings["Welcome back "] = "Welcome back ";
+$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';
@@ -282,6 +284,8 @@ $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['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
@@ -304,6 +308,7 @@ $a->strings['Approve'] = 'Approve';
 $a->strings['No notifications.'] = 'No notifications.';
 $a->strings['No registrations.'] = 'No registrations.';
 $a->strings['Login failed.'] = 'Login failed.';
+$a->strings["Welcome back "] = "Welcome back ";
 $a->strings['Photo Albums'] = 'Photo Albums';
 $a->strings['Contact Photos'] = 'Contact Photos';
 $a->strings['Contact information unavailable'] = 'Contact information unavailable';
@@ -336,12 +341,8 @@ $a->strings['Recent Photos'] = 'Recent Photos';
 $a->strings['Upload New Photos'] = 'Upload New Photos';
 $a->strings['View Album'] = 'View Album';
 $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
-$a->strings['Image size reduction [175] failed.'] = 'Image size reduction [175] failed.';
-$a->strings['Image size reduction [80] failed.'] = 'Image size reduction [80] failed.';
-$a->strings['Image size reduction [48] failed.'] = 'Image size reduction [48] failed.';
 $a->strings['Unable to process image'] = 'Unable to process image';
 $a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
-$a->strings['Image size reduction [640] failed.'] = 'Image size reduction [640] failed.';
 $a->strings['Profile Name is required.'] = 'Profile Name is required.';
 $a->strings['Profile updated.'] = 'Profile updated.';
 $a->strings['Profile deleted.'] = 'Profile deleted.';
@@ -357,17 +358,16 @@ $a->strings['Please use a shorter name.'] = 'Please use a shorter name.';
 $a->strings['Name too short.'] = 'Name too short.';
 $a->strings["That doesn\'t appear to be your full \x28First Last\x29 name."] = "That doesn\'t appear to be your full \x28First Last\x29 name.";
 $a->strings['Your email domain is not among those allowed on this site.'] = 'Your email domain is not among those allowed on this site.';
+$a->strings['Not a valid email address.'] = 'Not a valid email address.';
 $a->strings['Cannot use that email.'] = 'Cannot use that email.';
 $a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.'] = 'Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.';
 $a->strings['Nickname is already registered. Please choose another.'] = 'Nickname is already registered. Please choose another.';
 $a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.';
 $a->strings['An error occurred during registration. Please try again.'] = 'An error occurred during registration. Please try again.';
 $a->strings['An error occurred creating your default profile. Please try again.'] = 'An error occurred creating your default profile. Please try again.';
-$a->strings['Registration details for '] = 'Registration details for ';
 $a->strings['Registration successful. Please check your email for further instructions.'] = 'Registration successful. Please check your email for further instructions.';
 $a->strings['Failed to send email message. Here is the message that failed.'] = 'Failed to send email message. Here is the message that failed.';
 $a->strings['Your registration can not be processed.'] = 'Your registration can not be processed.';
-$a->strings['Registration request at '] = 'Registration request at ';
 $a->strings['Your registration is pending approval by the site owner.'] = 'Your registration is pending approval by the site owner.';
 $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.";
 $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.';
@@ -380,7 +380,6 @@ $a->strings['Your Email Address: '] = 'Your Email Address: ';
 $a->strings['Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'] = 'Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.';
 $a->strings['Choose a nickname: '] = 'Choose a nickname: ';
 $a->strings['Please login.'] = 'Please login.';
-$a->strings['Registration revoked for '] = 'Registration revoked for ';
 $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.';
@@ -509,6 +508,7 @@ $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.';
 $a->strings['Facebook Connect'] = 'Facebook Connect';
 $a->strings['Install Facebook post connector'] = 'Install Facebook post connector';
 $a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector';
+$a->strings['Post to Facebook by default'] = 'Post to Facebook by default';
 $a->strings['Facebook'] = 'Facebook';
 $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings';
 $a->strings['Post to Facebook'] = 'Post to Facebook';
@@ -623,9 +623,7 @@ $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';
@@ -703,9 +701,7 @@ $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';
@@ -724,7 +720,6 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
-$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@ -741,14 +736,11 @@ $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';
@@ -770,7 +762,6 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
 $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
 $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
 $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
-$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
 $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
 $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
 $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@ -807,7 +798,6 @@ $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';
@@ -819,9 +809,7 @@ $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';
@@ -833,7 +821,6 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
-$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';