From e1c0b5c7c5c66dc9ec6c81560851e7ce919ebf72 Mon Sep 17 00:00:00 2001 From: olivierm Date: Fri, 21 Jan 2011 10:39:15 +0100 Subject: [PATCH 01/14] Started the french translation (up to the "TODO" comment in view/fr/strings.php) --- view/fr/cmnt_received_eml.tpl | 18 + view/fr/contact_edit.tpl | 79 +++ view/fr/cropbody.tpl | 57 ++ view/fr/dfrn_req_confirm.tpl | 17 + view/fr/directory_header.tpl | 14 + view/fr/follow_notify_eml.tpl | 14 + view/fr/friend_complete_eml.tpl | 22 + view/fr/group_edit.tpl | 24 + view/fr/group_new.tpl | 23 + view/fr/head.tpl | 32 + view/fr/htconfig.tpl | 64 ++ view/fr/insecure_net.tpl | 6 + view/fr/install_db.tpl | 40 ++ view/fr/intro_complete_eml.tpl | 22 + view/fr/intros-top.tpl | 7 + view/fr/jot-header.tpl | 132 ++++ view/fr/jot.tpl | 45 ++ view/fr/like.tpl | 5 + view/fr/logout.tpl | 6 + view/fr/lostpass.tpl | 18 + view/fr/lostpass_eml.tpl | 32 + view/fr/mail_received_eml.tpl | 16 + view/fr/msg-header.tpl | 100 +++ view/fr/netfriend.tpl | 14 + view/fr/pagetypes.tpl | 25 + view/fr/passchanged_eml.tpl | 20 + view/fr/profile-hide-friends.tpl | 16 + view/fr/profile-in-directory.tpl | 16 + view/fr/profile-in-netdir.tpl | 16 + view/fr/profile.php | 72 ++ view/fr/profile_advanced.php | 226 ++++++ view/fr/profile_edit.tpl | 293 ++++++++ view/fr/profile_entry_default.tpl | 9 + view/fr/profile_listing_header.tpl | 8 + view/fr/profile_photo.tpl | 14 + view/fr/profile_tabs.tpl | 7 + view/fr/pwdreset.tpl | 16 + view/fr/register-link.tpl | 1 + view/fr/register_open_eml.tpl | 25 + view/fr/register_verify_eml.tpl | 26 + view/fr/registrations-top.tpl | 3 + view/fr/registrations.tpl | 1 + view/fr/request_notify_eml.tpl | 17 + view/fr/settings.tpl | 163 +++++ view/fr/settings_nick_set.tpl | 9 + view/fr/settings_nick_subdir.tpl | 6 + view/fr/settings_nick_unset.tpl | 14 + view/fr/strings.php | 1035 ++++++++++++++++++++++++++++ view/fr/wall_item_drop.tpl | 2 + view/fr/wall_received_eml.tpl | 18 + view/fr/wallwall_item.tpl | 36 + 51 files changed, 2901 insertions(+) create mode 100644 view/fr/cmnt_received_eml.tpl create mode 100644 view/fr/contact_edit.tpl create mode 100644 view/fr/cropbody.tpl create mode 100644 view/fr/dfrn_req_confirm.tpl create mode 100644 view/fr/directory_header.tpl create mode 100644 view/fr/follow_notify_eml.tpl create mode 100644 view/fr/friend_complete_eml.tpl create mode 100644 view/fr/group_edit.tpl create mode 100644 view/fr/group_new.tpl create mode 100644 view/fr/head.tpl create mode 100644 view/fr/htconfig.tpl create mode 100644 view/fr/insecure_net.tpl create mode 100644 view/fr/install_db.tpl create mode 100644 view/fr/intro_complete_eml.tpl create mode 100644 view/fr/intros-top.tpl create mode 100644 view/fr/jot-header.tpl create mode 100644 view/fr/jot.tpl create mode 100644 view/fr/like.tpl create mode 100644 view/fr/logout.tpl create mode 100644 view/fr/lostpass.tpl create mode 100644 view/fr/lostpass_eml.tpl create mode 100644 view/fr/mail_received_eml.tpl create mode 100644 view/fr/msg-header.tpl create mode 100644 view/fr/netfriend.tpl create mode 100644 view/fr/pagetypes.tpl create mode 100644 view/fr/passchanged_eml.tpl create mode 100644 view/fr/profile-hide-friends.tpl create mode 100644 view/fr/profile-in-directory.tpl create mode 100644 view/fr/profile-in-netdir.tpl create mode 100644 view/fr/profile.php create mode 100644 view/fr/profile_advanced.php create mode 100644 view/fr/profile_edit.tpl create mode 100644 view/fr/profile_entry_default.tpl create mode 100644 view/fr/profile_listing_header.tpl create mode 100644 view/fr/profile_photo.tpl create mode 100644 view/fr/profile_tabs.tpl create mode 100644 view/fr/pwdreset.tpl create mode 100644 view/fr/register-link.tpl create mode 100644 view/fr/register_open_eml.tpl create mode 100644 view/fr/register_verify_eml.tpl create mode 100644 view/fr/registrations-top.tpl create mode 100644 view/fr/registrations.tpl create mode 100644 view/fr/request_notify_eml.tpl create mode 100644 view/fr/settings.tpl create mode 100644 view/fr/settings_nick_set.tpl create mode 100644 view/fr/settings_nick_subdir.tpl create mode 100644 view/fr/settings_nick_unset.tpl create mode 100644 view/fr/strings.php create mode 100644 view/fr/wall_item_drop.tpl create mode 100644 view/fr/wall_received_eml.tpl create mode 100644 view/fr/wallwall_item.tpl diff --git a/view/fr/cmnt_received_eml.tpl b/view/fr/cmnt_received_eml.tpl new file mode 100644 index 0000000000..d60fcd375d --- /dev/null +++ b/view/fr/cmnt_received_eml.tpl @@ -0,0 +1,18 @@ + +Dear $username, + + '$from' commented on an item/conversation which you have been following. + +----- +$body +----- + +Please login at $siteurl to view the complete conversation: + +$display + +Thank you, + $sitename administrator + + + diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl new file mode 100644 index 0000000000..79a7651c1c --- /dev/null +++ b/view/fr/contact_edit.tpl @@ -0,0 +1,79 @@ + +

$header

+ +
$name
+ + +
+ +
+ $alt_text +
+ $name +
+
+
+
+ + + +
+
+
$lastupdtext$last_update +
$updpub
+ $poll_interval +
+
+
+ +$insecure +$blocked +$ignored + +
+ + +
+

Contact Information / Notes

+ +
+
+ + + +
+

Profile Visibility

+

Please choose the profile you would like to display to $name when viewing your profile securely. +

+
+$profile_select +
+ + + + +
+

Online Reputation

+

+Occasionally your friends may wish to inquire about this person's online legitimacy. You may help them choose whether or not to interact with this person by providing a 'reputation' to guide them. +

+
+$rating +
+
+

+Please take a moment to elaborate on this selection if you feel it could be helpful to others. +

+ +
+
+$groups + + +
+
diff --git a/view/fr/cropbody.tpl b/view/fr/cropbody.tpl new file mode 100644 index 0000000000..39395af8e1 --- /dev/null +++ b/view/fr/cropbody.tpl @@ -0,0 +1,57 @@ +

Crop Image

+

+Please adjust the image cropping for optimum viewing. +

+
+ +
+
+
+
+ + + +
+ + + + + + + + + + +
+ +
+ +
diff --git a/view/fr/dfrn_req_confirm.tpl b/view/fr/dfrn_req_confirm.tpl new file mode 100644 index 0000000000..f053f22af2 --- /dev/null +++ b/view/fr/dfrn_req_confirm.tpl @@ -0,0 +1,17 @@ + +

+Welcome home $username. +
+Please confirm your introduction to $dfrn_url. + +

+
+ + + +$aes_allow + +
+ +
+
\ No newline at end of file diff --git a/view/fr/directory_header.tpl b/view/fr/directory_header.tpl new file mode 100644 index 0000000000..03eed62b3c --- /dev/null +++ b/view/fr/directory_header.tpl @@ -0,0 +1,14 @@ +

Site Directory

+ +$globaldir + +$finding + +
+
+ + +
+
+
+ diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl new file mode 100644 index 0000000000..ae758c9a8f --- /dev/null +++ b/view/fr/follow_notify_eml.tpl @@ -0,0 +1,14 @@ + +Dear $myname, + +You have a new follower at $sitename - '$requestor'. + +You may visit their profile at $url. + +Please login to your site to approve or ignore/cancel the request. + +$siteurl + +Regards, + + $sitename administrator \ No newline at end of file diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl new file mode 100644 index 0000000000..ab12fcb6b7 --- /dev/null +++ b/view/fr/friend_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear $username, + + Great news... '$fn' at '$dfrn_url' has accepted +your connection request at '$sitename'. + +You are now mutual friends and may exchange status updates, photos, and email +without restriction. + +Please visit your 'Contacts' page at $sitename if you wish to make +any changes to this relationship. + +$siteurl + +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '$fn']. + +Sincerely, + + $sitename Administrator + + diff --git a/view/fr/group_edit.tpl b/view/fr/group_edit.tpl new file mode 100644 index 0000000000..e6c7afb490 --- /dev/null +++ b/view/fr/group_edit.tpl @@ -0,0 +1,24 @@ +

Group Editor

+ + +
+
+
+ + +
+
+
+ +$selector + +
+$drop +
+
+ +
+ +
+
+
diff --git a/view/fr/group_new.tpl b/view/fr/group_new.tpl new file mode 100644 index 0000000000..a1efa77175 --- /dev/null +++ b/view/fr/group_new.tpl @@ -0,0 +1,23 @@ + + + +
+
+ +
+

+Create a group of contacts/friends. + +

+ + +
+
+ +
+ + +
+
+ + \ No newline at end of file diff --git a/view/fr/head.tpl b/view/fr/head.tpl new file mode 100644 index 0000000000..04dd39bdbb --- /dev/null +++ b/view/fr/head.tpl @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl new file mode 100644 index 0000000000..c7c19bf69e --- /dev/null +++ b/view/fr/htconfig.tpl @@ -0,0 +1,64 @@ +path to 'directory/subdirectory'. + +$a->path = '$urlpath'; + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '$timezone'; + +// What is your site name? + +$a->config['sitename'] = "My Friend Network"; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['register_policy'] = REGISTER_OPEN; +$a->config['register_text'] = ''; +$a->config['admin_email'] = ''; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['max_import_size'] = 10000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['php_path'] = '$phpath'; + +// Location of global directory submission page. + +$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; + +// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts + +$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; + +// Server-to-server private message encryption (RINO) is allowed by default. +// Encryption will only be provided if this setting is true and the +// PHP mcrypt extension is installed on both systems + +$a->config['system']['rino_encrypt'] = true; + diff --git a/view/fr/insecure_net.tpl b/view/fr/insecure_net.tpl new file mode 100644 index 0000000000..5628639ccf --- /dev/null +++ b/view/fr/insecure_net.tpl @@ -0,0 +1,6 @@ +
+

+The social network that $name belongs to is an open network with limited or non-existent privacy controls. +Please use appropriate discretion. +

+
\ No newline at end of file diff --git a/view/fr/install_db.tpl b/view/fr/install_db.tpl new file mode 100644 index 0000000000..c413689c25 --- /dev/null +++ b/view/fr/install_db.tpl @@ -0,0 +1,40 @@ + +

Friendika Social Network

+

Installation

+ +

+In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. +

+ +
+ + + + + +
+ + + +
+ + + +
+ + + +
+ +
+Please select a default timezone for your website +
+ +$tzselect + +
+ + +
+
+ diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl new file mode 100644 index 0000000000..a60745ec55 --- /dev/null +++ b/view/fr/intro_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear $username, + + '$fn' at '$dfrn_url' has accepted +your connection request at '$sitename'. + + '$fn' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. + + '$fn' may choose to extend this into a two-way or more permissive +relationship in the future. + + You will start receiving public status updates from '$fn', +which will appear on your 'Network' page at + +$siteurl + +Sincerely, + + $sitename Administrator diff --git a/view/fr/intros-top.tpl b/view/fr/intros-top.tpl new file mode 100644 index 0000000000..d8b7394a4a --- /dev/null +++ b/view/fr/intros-top.tpl @@ -0,0 +1,7 @@ +

Pending Friend/Connect Notifications

+ + + + diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl new file mode 100644 index 0000000000..b687f65a69 --- /dev/null +++ b/view/fr/jot-header.tpl @@ -0,0 +1,132 @@ + + + + + + diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl new file mode 100644 index 0000000000..6590cace8f --- /dev/null +++ b/view/fr/jot.tpl @@ -0,0 +1,45 @@ + +
+
+
 
+
+
+
+ +
+ + + + + + + + +
+ +
+
Upload Photo
+
+ +
+ Insert YouTube video +
+
+ Set your location +
+ +
+ +
+
Permission Settings$bang
+
+ +
+ +
+
+
diff --git a/view/fr/like.tpl b/view/fr/like.tpl new file mode 100644 index 0000000000..1c385e5deb --- /dev/null +++ b/view/fr/like.tpl @@ -0,0 +1,5 @@ + diff --git a/view/fr/logout.tpl b/view/fr/logout.tpl new file mode 100644 index 0000000000..9a6c1d763a --- /dev/null +++ b/view/fr/logout.tpl @@ -0,0 +1,6 @@ +
+
+ + +
+
diff --git a/view/fr/lostpass.tpl b/view/fr/lostpass.tpl new file mode 100644 index 0000000000..a7040c1493 --- /dev/null +++ b/view/fr/lostpass.tpl @@ -0,0 +1,18 @@ +

Forgot your Password?

+ +

+Enter your email address and submit to have your password reset. Then check your email for further instructions. +

+ +
+
+ + +
+
+
+ +
+
+
+ diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl new file mode 100644 index 0000000000..c350236a43 --- /dev/null +++ b/view/fr/lostpass_eml.tpl @@ -0,0 +1,32 @@ + +Dear $username, + A request was recently received at $sitename to reset your account +password. In order to confirm this request, please select the verification link +below or paste it into your web browser address bar. + +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. + +Your password will not be changed unless we can verify that you +issued this request. + +Follow this link to verify your identity: + +$reset_link + +You will then receive a follow-up message containing the new password. + +You may change that password from your account settings page after logging in. + +The login details are as follows: + +Site Location: $siteurl +Login Name: $email + + + + +Sincerely, + $sitename Administrator + + diff --git a/view/fr/mail_received_eml.tpl b/view/fr/mail_received_eml.tpl new file mode 100644 index 0000000000..261aec4bed --- /dev/null +++ b/view/fr/mail_received_eml.tpl @@ -0,0 +1,16 @@ + +Dear $username, + + You've received a new private message at $sitename from '$from'. +----- +$title +----- +$body +----- +Please login at $siteurl to read and reply to your private messages. + +Thank you, + $sitename administrator + + + diff --git a/view/fr/msg-header.tpl b/view/fr/msg-header.tpl new file mode 100644 index 0000000000..3d2567f627 --- /dev/null +++ b/view/fr/msg-header.tpl @@ -0,0 +1,100 @@ + + + + + + diff --git a/view/fr/netfriend.tpl b/view/fr/netfriend.tpl new file mode 100644 index 0000000000..b041ec49f7 --- /dev/null +++ b/view/fr/netfriend.tpl @@ -0,0 +1,14 @@ +
Approve as:
+ +
+ + +
+
+
+
+ + +
+
+
diff --git a/view/fr/pagetypes.tpl b/view/fr/pagetypes.tpl new file mode 100644 index 0000000000..2036614abd --- /dev/null +++ b/view/fr/pagetypes.tpl @@ -0,0 +1,25 @@ + +
+ + + This account is a normal personal profile +
+
+
+ + + Automatically approve all connection/friend requests as read-only fans +
+
+
+ + + Automatically approve all connection/friend requests as read-write fans +
+
+
+ + + Automatically approve all connection/friend requests as friends +
+
diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl new file mode 100644 index 0000000000..9692159e18 --- /dev/null +++ b/view/fr/passchanged_eml.tpl @@ -0,0 +1,20 @@ + +Dear $username, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). + + +Your login details are as follows: + +Site Location: $siteurl +Login Name: $email +Password: $new_password + +You may change that password from your account settings page after logging in. + + +Sincerely, + $sitename Administrator + + diff --git a/view/fr/profile-hide-friends.tpl b/view/fr/profile-hide-friends.tpl new file mode 100644 index 0000000000..54ade00fec --- /dev/null +++ b/view/fr/profile-hide-friends.tpl @@ -0,0 +1,16 @@ +

+Hide my contact/friend list from viewers of this profile? +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/fr/profile-in-directory.tpl b/view/fr/profile-in-directory.tpl new file mode 100644 index 0000000000..98af3e59a9 --- /dev/null +++ b/view/fr/profile-in-directory.tpl @@ -0,0 +1,16 @@ +

+Publish your default profile in site directory? +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/fr/profile-in-netdir.tpl b/view/fr/profile-in-netdir.tpl new file mode 100644 index 0000000000..be111aa67f --- /dev/null +++ b/view/fr/profile-in-netdir.tpl @@ -0,0 +1,16 @@ +

+Publish your default profile in global social directory? +

+ +
+ + + +
+
+
+ + + +
+
diff --git a/view/fr/profile.php b/view/fr/profile.php new file mode 100644 index 0000000000..fa7372668c --- /dev/null +++ b/view/fr/profile.php @@ -0,0 +1,72 @@ + + + + <?php if(x($page,'title')) echo $page['title']; ?> + + + +
+ + +
+ +
+
+
+ +
+ + + diff --git a/view/fr/profile_advanced.php b/view/fr/profile_advanced.php new file mode 100644 index 0000000000..9aee6c2627 --- /dev/null +++ b/view/fr/profile_advanced.php @@ -0,0 +1,226 @@ +Profile + + +EOT; + +if($a->profile['name']) { +$o .= <<< EOT +
+
Full Name:
+
{$a->profile['name']}
+
+
+EOT; +} + +if($a->profile['gender']) { +$o .= <<< EOT +
+
Gender:
+
{$a->profile['gender']}
+
+
+EOT; +} + +if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { +$o .= <<< EOT +
+
Birthday:
+EOT; + +// If no year, add an arbitrary one so just we can parse the month and day. + +$o .= '
' + . ((intval($a->profile['dob'])) + ? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')) + : day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F'))) + . "
\r\n
"; + +$o .= '
'; + +} + +if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { +$o .= <<< EOT +
+
Age:
+
$age
+
+
+EOT; +} + +if($a->profile['marital']) { +$o .= <<< EOT +
+
♥ Status:
+
{$a->profile['marital']}
+EOT; + +if($a->profile['with']) + $o .= "
({$a->profile['with']})
"; +$o .= <<< EOT +
+
+EOT; +} + +if($a->profile['sexual']) { +$o .= <<< EOT +
+
Sexual Preference:
+
{$a->profile['sexual']}
+
+
+EOT; +} + +if($a->profile['homepage']) { + $homepage = linkify($a->profile['homepage']); +$o .= <<< EOT +
+
Homepage:
+
$homepage
+
+
+EOT; +} + +if($a->profile['politic']) { +$o .= <<< EOT +
+
Political Views:
+
{$a->profile['politic']}
+
+
+EOT; +} + +if($a->profile['religion']) { +$o .= <<< EOT +
+
Religion:
+
{$a->profile['religion']}
+
+
+EOT; +} + +if($txt = bbcode($a->profile['about'])) { +$o .= <<< EOT +
+
About:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['interest'])) { +$o .= <<< EOT +
+
Hobbies/Interests:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['contact'])) { +$o .= <<< EOT +
+
Contact information and Social Networks:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['music'])) { +$o .= <<< EOT +
+
Musical interests:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['book'])) { +$o .= <<< EOT +
+
Books, literature:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['tv'])) { +$o .= <<< EOT +
+
Television:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['film'])) { +$o .= <<< EOT +
+
Film/dance/culture/entertainment:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['romance'])) { +$o .= <<< EOT +
+
Love/romance:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['work'])) { +$o .= <<< EOT +
+
Work/employment:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['education'])) { +$o .= <<< EOT +
+
School/education:
+
+
$txt
+
+
+EOT; +} + + diff --git a/view/fr/profile_edit.tpl b/view/fr/profile_edit.tpl new file mode 100644 index 0000000000..beff3b8bd5 --- /dev/null +++ b/view/fr/profile_edit.tpl @@ -0,0 +1,293 @@ +

Edit Profile Details

+ + + + + +$default + +
+
+ +
+ +
*
+
+
+ +
+ + +
+
+ +
+ + +
+
+ + +
+ +$gender +
+
+ +
+ +
+$dob $age +
+
+
+ +$hide_friends + +
+ +
+
+ + +
+ + +
+
+ +
+ + +
+
+ + +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ +
+
+ +
+ +$marital +
+ + +
+ +
+ +$sexual +
+
+ + + +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ + +
(Used for searching public profiles, never shown to others)
+
+ + +
+ +
+
+ +
+

+Tell us about yourself... +

+ + + +
+
+
+ + +
+

+Hobbies/Interests +

+ + + +
+
+
+ + +
+

+Contact information and Social Networks +

+ + + +
+
+
+ + +
+ +
+
+ + +
+

+Musical interests +

+ + + +
+
+
+ +
+

+Books, literature +

+ + + +
+
+ + + + +
+

+Television +

+ + + +
+
+ + + + +
+

+Film/dance/culture/entertainment +

+ + + +
+
+ + + +
+ +
+
+ + +
+

+Love/romance +

+ + + +
+
+ + + + +
+

+Work/employment +

+ + + +
+
+ + + + +
+

+School/education +

+ + + +
+
+ + + + +
+ +
+
+ + + + + \ No newline at end of file diff --git a/view/fr/profile_entry_default.tpl b/view/fr/profile_entry_default.tpl new file mode 100644 index 0000000000..6511999184 --- /dev/null +++ b/view/fr/profile_entry_default.tpl @@ -0,0 +1,9 @@ + +
+
+Profile Image +
+
+ +
+
diff --git a/view/fr/profile_listing_header.tpl b/view/fr/profile_listing_header.tpl new file mode 100644 index 0000000000..d4b139a698 --- /dev/null +++ b/view/fr/profile_listing_header.tpl @@ -0,0 +1,8 @@ +

Profiles

+

+Change profile photo +

+ + diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl new file mode 100644 index 0000000000..d518e73312 --- /dev/null +++ b/view/fr/profile_photo.tpl @@ -0,0 +1,14 @@ +

Upload Profile Photo

+ +
+ +
+ + +
+ +
+ +
+ +
\ No newline at end of file diff --git a/view/fr/profile_tabs.tpl b/view/fr/profile_tabs.tpl new file mode 100644 index 0000000000..9c6c54a1c5 --- /dev/null +++ b/view/fr/profile_tabs.tpl @@ -0,0 +1,7 @@ + +
+ Status + Profile + Photos +
+
\ No newline at end of file diff --git a/view/fr/pwdreset.tpl b/view/fr/pwdreset.tpl new file mode 100644 index 0000000000..dd609f0610 --- /dev/null +++ b/view/fr/pwdreset.tpl @@ -0,0 +1,16 @@ +

Password Reset

+ +

+Your password has been reset as requested. +

+

+Your new password is +

+

+$newpass +

+

+Save or copy your new password - and then click here to login. +

+

+Your password may be changed from the 'Settings' page after successful login. \ No newline at end of file diff --git a/view/fr/register-link.tpl b/view/fr/register-link.tpl new file mode 100644 index 0000000000..7f3fca4d6c --- /dev/null +++ b/view/fr/register-link.tpl @@ -0,0 +1 @@ + Register diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl new file mode 100644 index 0000000000..c88eba8d35 --- /dev/null +++ b/view/fr/register_open_eml.tpl @@ -0,0 +1,25 @@ + +Dear $username, + Thank you for registering at $sitename. Your account has been created. +The login details are as follows: + + +Site Location: $siteurl +Login Name: $email +Password: $password + +You may change your password from your account "Settings" page after logging +in. + +Please take a few moments to review the other account settings on that page. +By default your account is private and hidden (invisible to other people). +You might wish to change this by publishing your profile - so that it appears +in a directory and other people can find you. + + +Thank you and welcome to $sitename. + +Sincerely, + $sitename Administrator + + diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl new file mode 100644 index 0000000000..60c38d8000 --- /dev/null +++ b/view/fr/register_verify_eml.tpl @@ -0,0 +1,26 @@ + +A new user registration request was received at $sitename which requires +your approval. + + +The login details are as follows: + +Full Name: $username +Site Location: $siteurl +Login Name: $email + + +To approve this request please visit the following link: + + +$siteurl/regmod/allow/$hash + + +To deny the request and remove the account, please visit: + + +$siteurl/regmod/deny/$hash + + +Thank you. + diff --git a/view/fr/registrations-top.tpl b/view/fr/registrations-top.tpl new file mode 100644 index 0000000000..d8faf3439e --- /dev/null +++ b/view/fr/registrations-top.tpl @@ -0,0 +1,3 @@ +

User registrations waiting for confirm

+ + diff --git a/view/fr/registrations.tpl b/view/fr/registrations.tpl new file mode 100644 index 0000000000..c8646043ed --- /dev/null +++ b/view/fr/registrations.tpl @@ -0,0 +1 @@ +
  • $fullname ($email) : Approve - Deny
    • diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl new file mode 100644 index 0000000000..9eef7a61eb --- /dev/null +++ b/view/fr/request_notify_eml.tpl @@ -0,0 +1,17 @@ + +Dear $myname, + +You have just received a connection request at $sitename + +from '$requestor'. + +You may visit their profile at $url. + +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. + +$siteurl + +Regards, + + $sitename administrator \ No newline at end of file diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl new file mode 100644 index 0000000000..5e1bfabf4c --- /dev/null +++ b/view/fr/settings.tpl @@ -0,0 +1,163 @@ +

    Account Settings

    + + + +$nickname_block + + +
    + + +

    Basic Settings

    + +
    + + +
    +
    + +
    + + +
    +
    + + + +
    + +$zoneselect +
    +
    + +
    + + +
    +
    + +
    + + +
    +
    + + + + +
    + +$theme +
    +
    + +
    + +
    + + +

    Security and Privacy Settings

    + + + + +
    + + +
    (to prevent spam abuse)
    +
    +
    + + + + +$profile_in_dir + +$profile_in_net_dir + + + +
    + +
    + + +
    +
    + +
    + +
    + + + +

    Notification Settings

    + + +
    +
    Send a notification email when:
    + + +
    + + +
    + + +
    + + +
    + + +
    +
    +
    + +
    + +
    + + +

    Password Settings

    + + +
    +

    +Leave password fields blank unless changing +

    + + +
    +
    + +
    + + +
    +
    + +
    + $oidhtml +
    +
    + + +
    + +
    + + +

    Advanced Page Settings

    + +$pagetype + +
    + +
    + + diff --git a/view/fr/settings_nick_set.tpl b/view/fr/settings_nick_set.tpl new file mode 100644 index 0000000000..a36b3b9a20 --- /dev/null +++ b/view/fr/settings_nick_set.tpl @@ -0,0 +1,9 @@ + +
    +

    +Your profile address is '$nickname@$basepath' +

    +$subdir + +
    +
    diff --git a/view/fr/settings_nick_subdir.tpl b/view/fr/settings_nick_subdir.tpl new file mode 100644 index 0000000000..303c24df71 --- /dev/null +++ b/view/fr/settings_nick_subdir.tpl @@ -0,0 +1,6 @@ +

    +It appears that your website is located in a subdirectory of the
    +$hostname website, so this setting may not work reliably.
    +

    +

    If you have any issues, you may have better results using the profile
    address '$baseurl/profile/$nickname'. +

    \ No newline at end of file diff --git a/view/fr/settings_nick_unset.tpl b/view/fr/settings_nick_unset.tpl new file mode 100644 index 0000000000..903768b594 --- /dev/null +++ b/view/fr/settings_nick_unset.tpl @@ -0,0 +1,14 @@ + +
    +

    +Your profile URL is currently '$baseurl/profile/$uid'. +Setting a nickname will allow a friendly profile URL such as +'nickname@$basepath'. +
    +Once set, it can never be changed. The nickname must start with a letter; and only letters, numbers, dashes, and underscores are allowed. +

    + + +
    +
    + diff --git a/view/fr/strings.php b/view/fr/strings.php new file mode 100644 index 0000000000..7bc6abb1a4 --- /dev/null +++ b/view/fr/strings.php @@ -0,0 +1,1035 @@ +strings['Not Found'] = 'Non trouvé'; +$a->strings['Page not found.' ] = 'Page introuvable.' ; +$a->strings['Permission denied'] = 'Permission refusée'; +$a->strings['Permission denied.'] = 'Permission refusée.'; +$a->strings['Nickname or Email address: '] = 'Pseudo ou adresse email: '; +$a->strings['Password: '] = 'Mot de passe: '; +$a->strings['Login'] = 'Connexion'; +$a->strings['Nickname/Email/OpenID: '] = 'Pseudo/Email/OpenID: '; +$a->strings["Password \x28if not OpenID\x29: "] = "Mot de passe \x28sauf pour OpenID\x29: "; +$a->strings['Forgot your password?'] = 'Mot de passe oublié?'; +$a->strings['Password Reset'] = 'Réinitialiser le mot de passe'; +$a->strings['prev'] = 'prev'; +$a->strings['first'] = 'first'; +$a->strings['last'] = 'last'; +$a->strings['next'] = 'next'; +$a->strings[' likes this.'] = ' aime ça.'; +$a->strings[' doesn\'t like this.'] = ' n\'aime pas ça.'; +$a->strings['people'] = 'personne(s)'; +$a->strings['like this.'] = 'aime(nt) ça.'; +$a->strings['don\'t like this.'] = 'n\'aime(nt) pas ça.'; +$a->strings['and'] = 'et'; +$a->strings[', and '] = ', et '; +$a->strings[' other people'] = ' autre(s) personne(s)'; +$a->strings[' like this.'] = ' aime(nt) ça.'; +$a->strings[' don\'t like this.'] = ' n\'aime(nt) pas ça.'; +$a->strings['No contacts'] = 'Aucun contact'; +$a->strings['Contacts'] = 'Contacts'; +$a->strings['View Contacts'] = 'Voir les contacts'; +$a->strings['Search'] = 'Recherche'; +$a->strings['No profile'] = 'Aucun profil'; +$a->strings['Connect'] = 'Relier'; +$a->strings['Location:'] = 'Localisation:'; +$a->strings[', '] = ', '; +$a->strings['Gender:'] = 'Genre:'; +$a->strings['Status:'] = 'Statut:'; +$a->strings['Homepage:'] = 'Page personnelle:'; +$a->strings['Monday'] = 'Lundi'; +$a->strings['Tuesday'] = 'Mardi'; +$a->strings['Wednesday'] = 'Mercredi'; +$a->strings['Thursday'] = 'Jeudi'; +$a->strings['Friday'] = 'Vendredi'; +$a->strings['Saturday'] = 'Samedi'; +$a->strings['Sunday'] = 'Dimanche'; +$a->strings['January'] = 'Janvier'; +$a->strings['February'] = 'Février'; +$a->strings['March'] = 'Mars'; +$a->strings['April'] = 'Avril'; +$a->strings['May'] = 'Mai'; +$a->strings['June'] = 'Juin'; +$a->strings['July'] = 'Juillet'; +$a->strings['August'] = 'Août'; +$a->strings['September'] = 'Septembre'; +$a->strings['October'] = 'Octobre'; +$a->strings['November'] = 'Novembre'; +$a->strings['December'] = 'Décembre'; +$a->strings['Birthdays this week:'] = 'Anniversaires cette semaine:'; +$a->strings["\x28Adjusted for local time\x29"] = "\x28Ajustés pour le fuseau horaire local\x29"; +$a->strings['[today]'] = '[aujourd\'hui]'; +$a->strings["Invite Friends"] = "Inviter des amis"; +$a->strings['Connect/Follow [profile address]'] = 'Relier/Suivre [adresse du profil]'; +$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Exemple: bob@example.com, http://example.com/barbara'; +$a->strings['Follow'] = 'Suivre'; +$a->strings['Could not access contact record.'] = 'Impossible d\'accéder à l\'enregistrement du contact.'; +$a->strings['Could not locate selected profile.'] = 'Impossible de localiser le profil séléctionné.'; +$a->strings['Contact updated.'] = 'Contact mis-à-jour.'; +$a->strings['Failed to update contact record.'] = 'Échec de mise-à-jour du contact.'; +$a->strings['Contact has been '] = 'Ce contact a été '; +$a->strings['blocked'] = 'bloqué'; +$a->strings['unblocked'] = 'débloqué'; +$a->strings['ignored'] = 'ignoré'; +$a->strings['unignored'] = 'des-ignoré'; +$a->strings['stopped following'] = 'retiré de la liste de suivi'; +$a->strings['Contact has been removed.'] = 'Ce contact a été retiré.'; +$a->strings['Contact not found.'] = 'Contact introuvable.'; +$a->strings['Mutual Friendship'] = 'Relation réciproque'; +$a->strings['is a fan of yours'] = 'est un fan de vous'; +$a->strings['you are a fan of'] = 'vous êtes un fan de'; +$a->strings['Contact Editor'] = 'Éditeur de contact'; +$a->strings['Visit $name\'s profile'] = 'Visiter le profil de $name'; +$a->strings['Block/Unblock contact'] = 'Bloquer/débloquer ce contact'; +$a->strings['Ignore contact'] = 'Ignorer ce contact'; +$a->strings['Delete contact'] = 'Effacer ce contact'; +$a->strings['Last updated: '] = 'Dernière mise-à-jour: '; +$a->strings['Update public posts: '] = 'Met ses entrées publiques à jour: '; +$a->strings['Never'] = 'Jamais'; +$a->strings['Unblock this contact'] = 'Débloquer ce contact'; +$a->strings['Block this contact'] = 'Bloquer ce contact'; +$a->strings['Unignore this contact'] = 'Cesser d\'ignorer ce contact'; +$a->strings['Ignore this contact'] = 'Ignorer ce contact'; +$a->strings['Currently blocked'] = 'Actuellement bloqué'; +$a->strings['Currently ignored'] = 'Actuellement ignoré'; +$a->strings['Show Blocked Connections'] = 'Montrer les connexions bloquées'; +$a->strings['Hide Blocked Connections'] = 'Cacher les connexion bloquées'; +// TODO +$a->strings['Finding: '] = 'Finding: '; +$a->strings['Find'] = 'Find'; +$a->strings['Visit '] = 'Visit '; +$a->strings['\'s profile'] = '\'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.'; +$a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: '; +$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully."; +$a->strings['Remote site reported: '] = 'Remote site reported: '; +$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again."; +$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['New mail received at '] = 'New mail received at '; +$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["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['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['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 this profile."] = "Incorrect identity currently logged in. Please login to this profile."; +$a->strings['[Name Withheld]'] = '[Name Withheld]'; +$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?'; +$a->strings['Yes'] = 'Yes'; +$a->strings['No'] = 'No'; +$a->strings['Add a personal note:'] = 'Add a personal note:'; +$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Please enter your profile address from one of the following supported social networks:'; +$a->strings['Friendika'] = 'Friendika'; +$a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web'; +$a->strings["Private \x28secure\x29 network"] = "Private \x28secure\x29 network"; +$a->strings["Public \x28insecure\x29 network"] = "Public \x28insecure\x29 network"; +$a->strings['Your profile address:'] = 'Your profile address:'; +$a->strings['Submit Request'] = 'Submit Request'; +$a->strings['Cancel'] = 'Cancel'; +$a->strings['Global Directory'] = 'Global Directory'; +$a->strings['Item not found.'] = 'Item not found.'; +$a->strings['Private Message'] = 'Private Message'; +$a->strings['This is you'] = 'This is you'; +$a->strings['View $name\'s profile'] = 'View $name\'s profile'; +$a->strings['Item has been removed.'] = 'Item has been removed.'; +$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.'; +$a->strings['following'] = 'following'; +$a->strings['Group created.'] = 'Group created.'; +$a->strings['Could not create group.'] = 'Could not create group.'; +$a->strings['Group not found.'] = 'Group not found.'; +$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['Delete'] = 'Delete'; +$a->strings["Welcome to "] = "Welcome to "; +$a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.'; +$a->strings['Connected to database.'] = 'Connected to database.'; +$a->strings['Database import succeeded.'] = 'Database import succeeded.'; +$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'; +$a->strings['Please see the file "INSTALL.txt".'] = 'Please see the file "INSTALL.txt".'; +$a->strings['Database import failed.'] = 'Database import failed.'; +$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.'; +$a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.'; +$a->strings['Submit'] = 'Submit'; +$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.'; +$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; +$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; +$a->strings['This is required for message delivery to work.'] = 'This is required for message delivery to work.'; +$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'; +$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'; +$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Error: Apache webserver mod-rewrite module is required but not installed.'; +$a->strings['Error: libCURL PHP module required but not installed.'] = 'Error: libCURL PHP module required but not installed.'; +$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Error: GD graphics PHP module with JPEG support required but not installed.'; +$a->strings['Error: openssl PHP module required but not installed.'] = 'Error: openssl PHP module required but not installed.'; +$a->strings['Error: mysqli PHP module required but not installed.'] = 'Error: mysqli PHP module required but not installed.'; +$a->strings['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.'] = '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.'; +$a->strings['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.'] = '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.'; +$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Please check with your site documentation or support people to see if this situation can be corrected.'; +$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['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['Please join my social network on '] = 'Please join my social network on '; +$a->strings["\r\n"] = "\r\n"; +$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['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[" 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['photo'] = 'photo'; +$a->strings['status'] = 'status'; +$a->strings['likes'] = 'likes'; +$a->strings['doesn\'t like'] = 'doesn\'t like'; +$a->strings['\'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['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['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['Normal View'] = 'Normal View'; +$a->strings['New Item View'] = 'New Item View'; +$a->strings['No such group'] = 'No such group'; +$a->strings['Group is empty'] = 'Group is empty'; +$a->strings['Group: '] = 'Group: '; +$a->strings['View in context'] = 'View in context'; +$a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; +$a->strings['Discard'] = 'Discard'; +$a->strings['Ignore'] = 'Ignore'; +$a->strings['Show Ignored Requests'] = 'Show Ignored Requests'; +$a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests'; +$a->strings['Claims to be known to you: '] = 'Claims to be known to you: '; +$a->strings['yes'] = 'yes'; +$a->strings['no'] = 'no'; +$a->strings['Notification type: '] = 'Notification type: '; +$a->strings['Friend/Connect Request'] = 'Friend/Connect Request'; +$a->strings['New Follower'] = 'New Follower'; +$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'; +$a->strings['Profile Photos'] = 'Profile Photos'; +$a->strings['Album not found.'] = 'Album not found.'; +$a->strings['Delete Album'] = 'Delete Album'; +$a->strings['Delete Photo'] = 'Delete Photo'; +$a->strings['was tagged in a'] = 'was tagged in a'; +$a->strings['by'] = 'by'; +$a->strings['Image exceeds size limit of '] = 'Image exceeds size limit of '; +$a->strings['Unable to process image.'] = 'Unable to process image.'; +$a->strings['Image upload failed.'] = 'Image upload failed.'; +$a->strings['No photos selected'] = 'No photos selected'; +$a->strings['Upload Photos'] = 'Upload Photos'; +$a->strings['New album name: '] = 'New album name: '; +$a->strings['or existing album name: '] = 'or existing album name: '; +$a->strings['Select files to upload: '] = 'Select files to upload: '; +$a->strings['Permissions'] = 'Permissions'; +$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Use the following controls only if the Java uploader [above] fails to launch.'; +$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['View Full Size'] = 'View Full Size'; +$a->strings['Tags: '] = 'Tags: '; +$a->strings['[Remove any tag]'] = '[Remove any tag]'; +$a->strings['Caption'] = 'Caption'; +$a->strings['Add a Tag'] = 'Add a Tag'; +$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'; +$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.'; +$a->strings['Profile-'] = 'Profile-'; +$a->strings['New profile created.'] = 'New profile created.'; +$a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.'; +$a->strings['This is your public profile.
    It may be visible to anybody using the internet.'] = 'This is your public profile.
    It may be visible to anybody using the internet.'; +$a->strings['Age: '] = 'Age: '; +$a->strings['Profile Image'] = 'Profile Image'; +$a->strings['Invalid OpenID url'] = 'Invalid OpenID url'; +$a->strings['Please enter the required information.'] = 'Please enter the required information.'; +$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['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.'; +$a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; +$a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; +$a->strings['Registration'] = 'Registration'; +$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; +$a->strings['Your Email Address: '] = 'Your Email Address: '; +$a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'] = 'Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'; +$a->strings['Choose a nickname: '] = 'Choose a nickname: '; +$a->strings['Register'] = 'Register'; +$a->strings['Please login.'] = 'Please login.'; +$a->strings['Registration revoked for '] = 'Registration revoked for '; +$a->strings['Account approved.'] = 'Account approved.'; +$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.'; +$a->strings['Password update failed. Please try again.'] = 'Password update failed. Please try again.'; +$a->strings[' Please use a shorter name.'] = ' Please use a shorter name.'; +$a->strings[' Name too short.'] = ' Name too short.'; +$a->strings[' Not valid email.'] = ' Not valid email.'; +$a->strings[' Cannot change to that email.'] = ' Cannot change to that email.'; +$a->strings['Settings updated.'] = 'Settings updated.'; +$a->strings['Plugin Settings'] = 'Plugin Settings'; +$a->strings['Account Settings'] = 'Account Settings'; +$a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; +$a->strings['OpenID: '] = 'OpenID: '; +$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; +$a->strings['Profile is not published.'] = 'Profile is not published.'; +$a->strings['Default Post Permissions'] = 'Default Post Permissions'; +$a->strings['Tag removed'] = 'Tag removed'; +$a->strings['Remove Item Tag'] = 'Remove Item Tag'; +$a->strings['Select a tag to remove: '] = 'Select a tag to remove: '; +$a->strings['Remove'] = 'Remove'; +$a->strings['No contacts.'] = 'No contacts.'; +$a->strings['Visible To:'] = 'Visible To:'; +$a->strings['Groups'] = 'Groups'; +$a->strings['Except For:'] = 'Except For:'; +$a->strings['Logged out.'] = 'Logged out.'; +$a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised'; +$a->strings['Block immediately'] = 'Block immediately'; +$a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer'; +$a->strings['Known to me, but no opinion'] = 'Known to me, but no opinion'; +$a->strings['OK, probably harmless'] = 'OK, probably harmless'; +$a->strings['Reputable, has my trust'] = 'Reputable, has my trust'; +$a->strings['Frequently'] = 'Frequently'; +$a->strings['Hourly'] = 'Hourly'; +$a->strings['Twice daily'] = 'Twice daily'; +$a->strings['Daily'] = 'Daily'; +$a->strings['Weekly'] = 'Weekly'; +$a->strings['Monthly'] = 'Monthly'; +$a->strings['Miscellaneous'] = 'Miscellaneous'; +$a->strings['less than a second ago'] = 'less than a second ago'; +$a->strings['year'] = 'year'; +$a->strings['years'] = 'years'; +$a->strings['month'] = 'month'; +$a->strings['months'] = 'months'; +$a->strings['week'] = 'week'; +$a->strings['weeks'] = 'weeks'; +$a->strings['day'] = 'day'; +$a->strings['days'] = 'days'; +$a->strings['hour'] = 'hour'; +$a->strings['hours'] = 'hours'; +$a->strings['minute'] = 'minute'; +$a->strings['minutes'] = 'minutes'; +$a->strings['second'] = 'second'; +$a->strings['seconds'] = 'seconds'; +$a->strings[' ago'] = ' ago'; +$a->strings['Create a new group'] = 'Create a new group'; +$a->strings['Everybody'] = 'Everybody'; +$a->strings['Birthday:'] = 'Birthday:'; +$a->strings['Logout'] = 'Logout'; +$a->strings['Home'] = 'Home'; +$a->strings['Directory'] = 'Directory'; +$a->strings['Network'] = 'Network'; +$a->strings['Notifications'] = 'Notifications'; +$a->strings['Settings'] = 'Settings'; +$a->strings['Profiles'] = 'Profiles'; +$a->strings['Male'] = 'Male'; +$a->strings['Female'] = 'Female'; +$a->strings['Currently Male'] = 'Currently Male'; +$a->strings['Currently Female'] = 'Currently Female'; +$a->strings['Mostly Male'] = 'Mostly Male'; +$a->strings['Mostly Female'] = 'Mostly Female'; +$a->strings['Transgender'] = 'Transgender'; +$a->strings['Intersex'] = 'Intersex'; +$a->strings['Transsexual'] = 'Transsexual'; +$a->strings['Hermaphrodite'] = 'Hermaphrodite'; +$a->strings['Neuter'] = 'Neuter'; +$a->strings['Non-specific'] = 'Non-specific'; +$a->strings['Other'] = 'Other'; +$a->strings['Undecided'] = 'Undecided'; +$a->strings['Males'] = 'Males'; +$a->strings['Females'] = 'Females'; +$a->strings['Gay'] = 'Gay'; +$a->strings['Lesbian'] = 'Lesbian'; +$a->strings['No Preference'] = 'No Preference'; +$a->strings['Bisexual'] = 'Bisexual'; +$a->strings['Autosexual'] = 'Autosexual'; +$a->strings['Abstinent'] = 'Abstinent'; +$a->strings['Virgin'] = 'Virgin'; +$a->strings['Deviant'] = 'Deviant'; +$a->strings['Fetish'] = 'Fetish'; +$a->strings['Oodles'] = 'Oodles'; +$a->strings['Nonsexual'] = 'Nonsexual'; +$a->strings['Single'] = 'Single'; +$a->strings['Lonely'] = 'Lonely'; +$a->strings['Available'] = 'Available'; +$a->strings['Unavailable'] = 'Unavailable'; +$a->strings['Dating'] = 'Dating'; +$a->strings['Unfaithful'] = 'Unfaithful'; +$a->strings['Sex Addict'] = 'Sex Addict'; +$a->strings['Friends'] = 'Friends'; +$a->strings['Friends/Benefits'] = 'Friends/Benefits'; +$a->strings['Casual'] = 'Casual'; +$a->strings['Engaged'] = 'Engaged'; +$a->strings['Married'] = 'Married'; +$a->strings['Partners'] = 'Partners'; +$a->strings['Cohabiting'] = 'Cohabiting'; +$a->strings['Happy'] = 'Happy'; +$a->strings['Not Looking'] = 'Not Looking'; +$a->strings['Swinger'] = 'Swinger'; +$a->strings['Betrayed'] = 'Betrayed'; +$a->strings['Separated'] = 'Separated'; +$a->strings['Unstable'] = 'Unstable'; +$a->strings['Divorced'] = 'Divorced'; +$a->strings['Widowed'] = 'Widowed'; +$a->strings['Uncertain'] = 'Uncertain'; +$a->strings['Complicated'] = 'Complicated'; +$a->strings['Don\'t care'] = 'Don\'t care'; +$a->strings['Ask me'] = 'Ask me'; +$a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; +$a->strings['Africa/Accra'] = 'Africa/Accra'; +$a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; +$a->strings['Africa/Algiers'] = 'Africa/Algiers'; +$a->strings['Africa/Asmara'] = 'Africa/Asmara'; +$a->strings['Africa/Asmera'] = 'Africa/Asmera'; +$a->strings['Africa/Bamako'] = 'Africa/Bamako'; +$a->strings['Africa/Bangui'] = 'Africa/Bangui'; +$a->strings['Africa/Banjul'] = 'Africa/Banjul'; +$a->strings['Africa/Bissau'] = 'Africa/Bissau'; +$a->strings['Africa/Blantyre'] = 'Africa/Blantyre'; +$a->strings['Africa/Brazzaville'] = 'Africa/Brazzaville'; +$a->strings['Africa/Bujumbura'] = 'Africa/Bujumbura'; +$a->strings['Africa/Cairo'] = 'Africa/Cairo'; +$a->strings['Africa/Casablanca'] = 'Africa/Casablanca'; +$a->strings['Africa/Ceuta'] = 'Africa/Ceuta'; +$a->strings['Africa/Conakry'] = 'Africa/Conakry'; +$a->strings['Africa/Dakar'] = 'Africa/Dakar'; +$a->strings['Africa/Dar_es_Salaam'] = 'Africa/Dar_es_Salaam'; +$a->strings['Africa/Djibouti'] = 'Africa/Djibouti'; +$a->strings['Africa/Douala'] = 'Africa/Douala'; +$a->strings['Africa/El_Aaiun'] = 'Africa/El_Aaiun'; +$a->strings['Africa/Freetown'] = 'Africa/Freetown'; +$a->strings['Africa/Gaborone'] = 'Africa/Gaborone'; +$a->strings['Africa/Harare'] = 'Africa/Harare'; +$a->strings['Africa/Johannesburg'] = 'Africa/Johannesburg'; +$a->strings['Africa/Kampala'] = 'Africa/Kampala'; +$a->strings['Africa/Khartoum'] = 'Africa/Khartoum'; +$a->strings['Africa/Kigali'] = 'Africa/Kigali'; +$a->strings['Africa/Kinshasa'] = 'Africa/Kinshasa'; +$a->strings['Africa/Lagos'] = 'Africa/Lagos'; +$a->strings['Africa/Libreville'] = 'Africa/Libreville'; +$a->strings['Africa/Lome'] = 'Africa/Lome'; +$a->strings['Africa/Luanda'] = 'Africa/Luanda'; +$a->strings['Africa/Lubumbashi'] = 'Africa/Lubumbashi'; +$a->strings['Africa/Lusaka'] = 'Africa/Lusaka'; +$a->strings['Africa/Malabo'] = 'Africa/Malabo'; +$a->strings['Africa/Maputo'] = 'Africa/Maputo'; +$a->strings['Africa/Maseru'] = 'Africa/Maseru'; +$a->strings['Africa/Mbabane'] = 'Africa/Mbabane'; +$a->strings['Africa/Mogadishu'] = 'Africa/Mogadishu'; +$a->strings['Africa/Monrovia'] = 'Africa/Monrovia'; +$a->strings['Africa/Nairobi'] = 'Africa/Nairobi'; +$a->strings['Africa/Ndjamena'] = 'Africa/Ndjamena'; +$a->strings['Africa/Niamey'] = 'Africa/Niamey'; +$a->strings['Africa/Nouakchott'] = 'Africa/Nouakchott'; +$a->strings['Africa/Ouagadougou'] = 'Africa/Ouagadougou'; +$a->strings['Africa/Porto-Novo'] = 'Africa/Porto-Novo'; +$a->strings['Africa/Sao_Tome'] = 'Africa/Sao_Tome'; +$a->strings['Africa/Timbuktu'] = 'Africa/Timbuktu'; +$a->strings['Africa/Tripoli'] = 'Africa/Tripoli'; +$a->strings['Africa/Tunis'] = 'Africa/Tunis'; +$a->strings['Africa/Windhoek'] = 'Africa/Windhoek'; +$a->strings['America/Adak'] = 'America/Adak'; +$a->strings['America/Anchorage'] = 'America/Anchorage'; +$a->strings['America/Anguilla'] = 'America/Anguilla'; +$a->strings['America/Antigua'] = 'America/Antigua'; +$a->strings['America/Araguaina'] = 'America/Araguaina'; +$a->strings['America/Argentina/Buenos_Aires'] = 'America/Argentina/Buenos_Aires'; +$a->strings['America/Argentina/Catamarca'] = 'America/Argentina/Catamarca'; +$a->strings['America/Argentina/ComodRivadavia'] = 'America/Argentina/ComodRivadavia'; +$a->strings['America/Argentina/Cordoba'] = 'America/Argentina/Cordoba'; +$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'; +$a->strings['America/Asuncion'] = 'America/Asuncion'; +$a->strings['America/Atikokan'] = 'America/Atikokan'; +$a->strings['America/Atka'] = 'America/Atka'; +$a->strings['America/Bahia'] = 'America/Bahia'; +$a->strings['America/Barbados'] = 'America/Barbados'; +$a->strings['America/Belem'] = 'America/Belem'; +$a->strings['America/Belize'] = 'America/Belize'; +$a->strings['America/Blanc-Sablon'] = 'America/Blanc-Sablon'; +$a->strings['America/Boa_Vista'] = 'America/Boa_Vista'; +$a->strings['America/Bogota'] = 'America/Bogota'; +$a->strings['America/Boise'] = 'America/Boise'; +$a->strings['America/Buenos_Aires'] = 'America/Buenos_Aires'; +$a->strings['America/Cambridge_Bay'] = 'America/Cambridge_Bay'; +$a->strings['America/Campo_Grande'] = 'America/Campo_Grande'; +$a->strings['America/Cancun'] = 'America/Cancun'; +$a->strings['America/Caracas'] = 'America/Caracas'; +$a->strings['America/Catamarca'] = 'America/Catamarca'; +$a->strings['America/Cayenne'] = 'America/Cayenne'; +$a->strings['America/Cayman'] = 'America/Cayman'; +$a->strings['America/Chicago'] = 'America/Chicago'; +$a->strings['America/Chihuahua'] = 'America/Chihuahua'; +$a->strings['America/Coral_Harbour'] = 'America/Coral_Harbour'; +$a->strings['America/Cordoba'] = 'America/Cordoba'; +$a->strings['America/Costa_Rica'] = 'America/Costa_Rica'; +$a->strings['America/Cuiaba'] = 'America/Cuiaba'; +$a->strings['America/Curacao'] = 'America/Curacao'; +$a->strings['America/Danmarkshavn'] = 'America/Danmarkshavn'; +$a->strings['America/Dawson'] = 'America/Dawson'; +$a->strings['America/Dawson_Creek'] = 'America/Dawson_Creek'; +$a->strings['America/Denver'] = 'America/Denver'; +$a->strings['America/Detroit'] = 'America/Detroit'; +$a->strings['America/Dominica'] = 'America/Dominica'; +$a->strings['America/Edmonton'] = 'America/Edmonton'; +$a->strings['America/Eirunepe'] = 'America/Eirunepe'; +$a->strings['America/El_Salvador'] = 'America/El_Salvador'; +$a->strings['America/Ensenada'] = 'America/Ensenada'; +$a->strings['America/Fort_Wayne'] = 'America/Fort_Wayne'; +$a->strings['America/Fortaleza'] = 'America/Fortaleza'; +$a->strings['America/Glace_Bay'] = 'America/Glace_Bay'; +$a->strings['America/Godthab'] = 'America/Godthab'; +$a->strings['America/Goose_Bay'] = 'America/Goose_Bay'; +$a->strings['America/Grand_Turk'] = 'America/Grand_Turk'; +$a->strings['America/Grenada'] = 'America/Grenada'; +$a->strings['America/Guadeloupe'] = 'America/Guadeloupe'; +$a->strings['America/Guatemala'] = 'America/Guatemala'; +$a->strings['America/Guayaquil'] = 'America/Guayaquil'; +$a->strings['America/Guyana'] = 'America/Guyana'; +$a->strings['America/Halifax'] = 'America/Halifax'; +$a->strings['America/Havana'] = 'America/Havana'; +$a->strings['America/Hermosillo'] = 'America/Hermosillo'; +$a->strings['America/Indiana/Indianapolis'] = 'America/Indiana/Indianapolis'; +$a->strings['America/Indiana/Knox'] = 'America/Indiana/Knox'; +$a->strings['America/Indiana/Marengo'] = 'America/Indiana/Marengo'; +$a->strings['America/Indiana/Petersburg'] = 'America/Indiana/Petersburg'; +$a->strings['America/Indiana/Tell_City'] = 'America/Indiana/Tell_City'; +$a->strings['America/Indiana/Vevay'] = 'America/Indiana/Vevay'; +$a->strings['America/Indiana/Vincennes'] = 'America/Indiana/Vincennes'; +$a->strings['America/Indiana/Winamac'] = 'America/Indiana/Winamac'; +$a->strings['America/Indianapolis'] = 'America/Indianapolis'; +$a->strings['America/Inuvik'] = 'America/Inuvik'; +$a->strings['America/Iqaluit'] = 'America/Iqaluit'; +$a->strings['America/Jamaica'] = 'America/Jamaica'; +$a->strings['America/Jujuy'] = 'America/Jujuy'; +$a->strings['America/Juneau'] = 'America/Juneau'; +$a->strings['America/Kentucky/Louisville'] = 'America/Kentucky/Louisville'; +$a->strings['America/Kentucky/Monticello'] = 'America/Kentucky/Monticello'; +$a->strings['America/Knox_IN'] = 'America/Knox_IN'; +$a->strings['America/La_Paz'] = 'America/La_Paz'; +$a->strings['America/Lima'] = 'America/Lima'; +$a->strings['America/Los_Angeles'] = 'America/Los_Angeles'; +$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'; +$a->strings['America/Merida'] = 'America/Merida'; +$a->strings['America/Mexico_City'] = 'America/Mexico_City'; +$a->strings['America/Miquelon'] = 'America/Miquelon'; +$a->strings['America/Moncton'] = 'America/Moncton'; +$a->strings['America/Monterrey'] = 'America/Monterrey'; +$a->strings['America/Montevideo'] = 'America/Montevideo'; +$a->strings['America/Montreal'] = 'America/Montreal'; +$a->strings['America/Montserrat'] = 'America/Montserrat'; +$a->strings['America/Nassau'] = 'America/Nassau'; +$a->strings['America/New_York'] = 'America/New_York'; +$a->strings['America/Nipigon'] = 'America/Nipigon'; +$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'; +$a->strings['America/Phoenix'] = 'America/Phoenix'; +$a->strings['America/Port-au-Prince'] = 'America/Port-au-Prince'; +$a->strings['America/Port_of_Spain'] = 'America/Port_of_Spain'; +$a->strings['America/Porto_Acre'] = 'America/Porto_Acre'; +$a->strings['America/Porto_Velho'] = 'America/Porto_Velho'; +$a->strings['America/Puerto_Rico'] = 'America/Puerto_Rico'; +$a->strings['America/Rainy_River'] = 'America/Rainy_River'; +$a->strings['America/Rankin_Inlet'] = 'America/Rankin_Inlet'; +$a->strings['America/Recife'] = 'America/Recife'; +$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'; +$a->strings['America/St_Thomas'] = 'America/St_Thomas'; +$a->strings['America/St_Vincent'] = 'America/St_Vincent'; +$a->strings['America/Swift_Current'] = 'America/Swift_Current'; +$a->strings['America/Tegucigalpa'] = 'America/Tegucigalpa'; +$a->strings['America/Thule'] = 'America/Thule'; +$a->strings['America/Thunder_Bay'] = 'America/Thunder_Bay'; +$a->strings['America/Tijuana'] = 'America/Tijuana'; +$a->strings['America/Toronto'] = 'America/Toronto'; +$a->strings['America/Tortola'] = 'America/Tortola'; +$a->strings['America/Vancouver'] = 'America/Vancouver'; +$a->strings['America/Virgin'] = 'America/Virgin'; +$a->strings['America/Whitehorse'] = 'America/Whitehorse'; +$a->strings['America/Winnipeg'] = 'America/Winnipeg'; +$a->strings['America/Yakutat'] = 'America/Yakutat'; +$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'; +$a->strings['Antarctica/Rothera'] = 'Antarctica/Rothera'; +$a->strings['Antarctica/South_Pole'] = 'Antarctica/South_Pole'; +$a->strings['Antarctica/Syowa'] = 'Antarctica/Syowa'; +$a->strings['Antarctica/Vostok'] = 'Antarctica/Vostok'; +$a->strings['Arctic/Longyearbyen'] = 'Arctic/Longyearbyen'; +$a->strings['Asia/Aden'] = 'Asia/Aden'; +$a->strings['Asia/Almaty'] = 'Asia/Almaty'; +$a->strings['Asia/Amman'] = 'Asia/Amman'; +$a->strings['Asia/Anadyr'] = 'Asia/Anadyr'; +$a->strings['Asia/Aqtau'] = 'Asia/Aqtau'; +$a->strings['Asia/Aqtobe'] = 'Asia/Aqtobe'; +$a->strings['Asia/Ashgabat'] = 'Asia/Ashgabat'; +$a->strings['Asia/Ashkhabad'] = 'Asia/Ashkhabad'; +$a->strings['Asia/Baghdad'] = 'Asia/Baghdad'; +$a->strings['Asia/Bahrain'] = 'Asia/Bahrain'; +$a->strings['Asia/Baku'] = 'Asia/Baku'; +$a->strings['Asia/Bangkok'] = 'Asia/Bangkok'; +$a->strings['Asia/Beirut'] = 'Asia/Beirut'; +$a->strings['Asia/Bishkek'] = 'Asia/Bishkek'; +$a->strings['Asia/Brunei'] = 'Asia/Brunei'; +$a->strings['Asia/Calcutta'] = 'Asia/Calcutta'; +$a->strings['Asia/Choibalsan'] = 'Asia/Choibalsan'; +$a->strings['Asia/Chongqing'] = 'Asia/Chongqing'; +$a->strings['Asia/Chungking'] = 'Asia/Chungking'; +$a->strings['Asia/Colombo'] = 'Asia/Colombo'; +$a->strings['Asia/Dacca'] = 'Asia/Dacca'; +$a->strings['Asia/Damascus'] = 'Asia/Damascus'; +$a->strings['Asia/Dhaka'] = 'Asia/Dhaka'; +$a->strings['Asia/Dili'] = 'Asia/Dili'; +$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'; +$a->strings['Asia/Istanbul'] = 'Asia/Istanbul'; +$a->strings['Asia/Jakarta'] = 'Asia/Jakarta'; +$a->strings['Asia/Jayapura'] = 'Asia/Jayapura'; +$a->strings['Asia/Jerusalem'] = 'Asia/Jerusalem'; +$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'; +$a->strings['Asia/Kuwait'] = 'Asia/Kuwait'; +$a->strings['Asia/Macao'] = 'Asia/Macao'; +$a->strings['Asia/Macau'] = 'Asia/Macau'; +$a->strings['Asia/Magadan'] = 'Asia/Magadan'; +$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'; +$a->strings['Asia/Phnom_Penh'] = 'Asia/Phnom_Penh'; +$a->strings['Asia/Pontianak'] = 'Asia/Pontianak'; +$a->strings['Asia/Pyongyang'] = 'Asia/Pyongyang'; +$a->strings['Asia/Qatar'] = 'Asia/Qatar'; +$a->strings['Asia/Qyzylorda'] = 'Asia/Qyzylorda'; +$a->strings['Asia/Rangoon'] = 'Asia/Rangoon'; +$a->strings['Asia/Riyadh'] = 'Asia/Riyadh'; +$a->strings['Asia/Saigon'] = 'Asia/Saigon'; +$a->strings['Asia/Sakhalin'] = 'Asia/Sakhalin'; +$a->strings['Asia/Samarkand'] = 'Asia/Samarkand'; +$a->strings['Asia/Seoul'] = 'Asia/Seoul'; +$a->strings['Asia/Shanghai'] = 'Asia/Shanghai'; +$a->strings['Asia/Singapore'] = 'Asia/Singapore'; +$a->strings['Asia/Taipei'] = 'Asia/Taipei'; +$a->strings['Asia/Tashkent'] = 'Asia/Tashkent'; +$a->strings['Asia/Tbilisi'] = 'Asia/Tbilisi'; +$a->strings['Asia/Tehran'] = 'Asia/Tehran'; +$a->strings['Asia/Tel_Aviv'] = 'Asia/Tel_Aviv'; +$a->strings['Asia/Thimbu'] = 'Asia/Thimbu'; +$a->strings['Asia/Thimphu'] = 'Asia/Thimphu'; +$a->strings['Asia/Tokyo'] = 'Asia/Tokyo'; +$a->strings['Asia/Ujung_Pandang'] = 'Asia/Ujung_Pandang'; +$a->strings['Asia/Ulaanbaatar'] = 'Asia/Ulaanbaatar'; +$a->strings['Asia/Ulan_Bator'] = 'Asia/Ulan_Bator'; +$a->strings['Asia/Urumqi'] = 'Asia/Urumqi'; +$a->strings['Asia/Vientiane'] = 'Asia/Vientiane'; +$a->strings['Asia/Vladivostok'] = 'Asia/Vladivostok'; +$a->strings['Asia/Yakutsk'] = 'Asia/Yakutsk'; +$a->strings['Asia/Yekaterinburg'] = 'Asia/Yekaterinburg'; +$a->strings['Asia/Yerevan'] = 'Asia/Yerevan'; +$a->strings['Atlantic/Azores'] = 'Atlantic/Azores'; +$a->strings['Atlantic/Bermuda'] = 'Atlantic/Bermuda'; +$a->strings['Atlantic/Canary'] = 'Atlantic/Canary'; +$a->strings['Atlantic/Cape_Verde'] = 'Atlantic/Cape_Verde'; +$a->strings['Atlantic/Faeroe'] = 'Atlantic/Faeroe'; +$a->strings['Atlantic/Faroe'] = 'Atlantic/Faroe'; +$a->strings['Atlantic/Jan_Mayen'] = 'Atlantic/Jan_Mayen'; +$a->strings['Atlantic/Madeira'] = 'Atlantic/Madeira'; +$a->strings['Atlantic/Reykjavik'] = 'Atlantic/Reykjavik'; +$a->strings['Atlantic/South_Georgia'] = 'Atlantic/South_Georgia'; +$a->strings['Atlantic/St_Helena'] = 'Atlantic/St_Helena'; +$a->strings['Atlantic/Stanley'] = 'Atlantic/Stanley'; +$a->strings['Australia/ACT'] = 'Australia/ACT'; +$a->strings['Australia/Adelaide'] = 'Australia/Adelaide'; +$a->strings['Australia/Brisbane'] = 'Australia/Brisbane'; +$a->strings['Australia/Broken_Hill'] = 'Australia/Broken_Hill'; +$a->strings['Australia/Canberra'] = 'Australia/Canberra'; +$a->strings['Australia/Currie'] = 'Australia/Currie'; +$a->strings['Australia/Darwin'] = 'Australia/Darwin'; +$a->strings['Australia/Eucla'] = 'Australia/Eucla'; +$a->strings['Australia/Hobart'] = 'Australia/Hobart'; +$a->strings['Australia/LHI'] = 'Australia/LHI'; +$a->strings['Australia/Lindeman'] = 'Australia/Lindeman'; +$a->strings['Australia/Lord_Howe'] = 'Australia/Lord_Howe'; +$a->strings['Australia/Melbourne'] = 'Australia/Melbourne'; +$a->strings['Australia/North'] = 'Australia/North'; +$a->strings['Australia/NSW'] = 'Australia/NSW'; +$a->strings['Australia/Perth'] = 'Australia/Perth'; +$a->strings['Australia/Queensland'] = 'Australia/Queensland'; +$a->strings['Australia/South'] = 'Australia/South'; +$a->strings['Australia/Sydney'] = 'Australia/Sydney'; +$a->strings['Australia/Tasmania'] = 'Australia/Tasmania'; +$a->strings['Australia/Victoria'] = 'Australia/Victoria'; +$a->strings['Australia/West'] = 'Australia/West'; +$a->strings['Australia/Yancowinna'] = 'Australia/Yancowinna'; +$a->strings['Brazil/Acre'] = 'Brazil/Acre'; +$a->strings['Brazil/DeNoronha'] = 'Brazil/DeNoronha'; +$a->strings['Brazil/East'] = 'Brazil/East'; +$a->strings['Brazil/West'] = 'Brazil/West'; +$a->strings['Canada/Atlantic'] = 'Canada/Atlantic'; +$a->strings['Canada/Central'] = 'Canada/Central'; +$a->strings['Canada/East-Saskatchewan'] = 'Canada/East-Saskatchewan'; +$a->strings['Canada/Eastern'] = 'Canada/Eastern'; +$a->strings['Canada/Mountain'] = 'Canada/Mountain'; +$a->strings['Canada/Newfoundland'] = 'Canada/Newfoundland'; +$a->strings['Canada/Pacific'] = 'Canada/Pacific'; +$a->strings['Canada/Saskatchewan'] = 'Canada/Saskatchewan'; +$a->strings['Canada/Yukon'] = 'Canada/Yukon'; +$a->strings['CET'] = 'CET'; +$a->strings['Chile/Continental'] = 'Chile/Continental'; +$a->strings['Chile/EasterIsland'] = 'Chile/EasterIsland'; +$a->strings['CST6CDT'] = 'CST6CDT'; +$a->strings['Cuba'] = 'Cuba'; +$a->strings['EET'] = 'EET'; +$a->strings['Egypt'] = 'Egypt'; +$a->strings['Eire'] = 'Eire'; +$a->strings['EST'] = 'EST'; +$a->strings['EST5EDT'] = 'EST5EDT'; +$a->strings['Etc/GMT'] = 'Etc/GMT'; +$a->strings['Etc/GMT+0'] = 'Etc/GMT+0'; +$a->strings['Etc/GMT+1'] = 'Etc/GMT+1'; +$a->strings['Etc/GMT+10'] = 'Etc/GMT+10'; +$a->strings['Etc/GMT+11'] = 'Etc/GMT+11'; +$a->strings['Etc/GMT+12'] = 'Etc/GMT+12'; +$a->strings['Etc/GMT+2'] = 'Etc/GMT+2'; +$a->strings['Etc/GMT+3'] = 'Etc/GMT+3'; +$a->strings['Etc/GMT+4'] = 'Etc/GMT+4'; +$a->strings['Etc/GMT+5'] = 'Etc/GMT+5'; +$a->strings['Etc/GMT+6'] = 'Etc/GMT+6'; +$a->strings['Etc/GMT+7'] = 'Etc/GMT+7'; +$a->strings['Etc/GMT+8'] = 'Etc/GMT+8'; +$a->strings['Etc/GMT+9'] = 'Etc/GMT+9'; +$a->strings['Etc/GMT-0'] = 'Etc/GMT-0'; +$a->strings['Etc/GMT-1'] = 'Etc/GMT-1'; +$a->strings['Etc/GMT-10'] = 'Etc/GMT-10'; +$a->strings['Etc/GMT-11'] = 'Etc/GMT-11'; +$a->strings['Etc/GMT-12'] = 'Etc/GMT-12'; +$a->strings['Etc/GMT-13'] = 'Etc/GMT-13'; +$a->strings['Etc/GMT-14'] = 'Etc/GMT-14'; +$a->strings['Etc/GMT-2'] = 'Etc/GMT-2'; +$a->strings['Etc/GMT-3'] = 'Etc/GMT-3'; +$a->strings['Etc/GMT-4'] = 'Etc/GMT-4'; +$a->strings['Etc/GMT-5'] = 'Etc/GMT-5'; +$a->strings['Etc/GMT-6'] = 'Etc/GMT-6'; +$a->strings['Etc/GMT-7'] = 'Etc/GMT-7'; +$a->strings['Etc/GMT-8'] = 'Etc/GMT-8'; +$a->strings['Etc/GMT-9'] = 'Etc/GMT-9'; +$a->strings['Etc/GMT0'] = 'Etc/GMT0'; +$a->strings['Etc/Greenwich'] = 'Etc/Greenwich'; +$a->strings['Etc/UCT'] = 'Etc/UCT'; +$a->strings['Etc/Universal'] = 'Etc/Universal'; +$a->strings['Etc/UTC'] = 'Etc/UTC'; +$a->strings['Etc/Zulu'] = 'Etc/Zulu'; +$a->strings['Europe/Amsterdam'] = 'Europe/Amsterdam'; +$a->strings['Europe/Andorra'] = 'Europe/Andorra'; +$a->strings['Europe/Athens'] = 'Europe/Athens'; +$a->strings['Europe/Belfast'] = 'Europe/Belfast'; +$a->strings['Europe/Belgrade'] = 'Europe/Belgrade'; +$a->strings['Europe/Berlin'] = 'Europe/Berlin'; +$a->strings['Europe/Bratislava'] = 'Europe/Bratislava'; +$a->strings['Europe/Brussels'] = 'Europe/Brussels'; +$a->strings['Europe/Bucharest'] = 'Europe/Bucharest'; +$a->strings['Europe/Budapest'] = 'Europe/Budapest'; +$a->strings['Europe/Chisinau'] = 'Europe/Chisinau'; +$a->strings['Europe/Copenhagen'] = 'Europe/Copenhagen'; +$a->strings['Europe/Dublin'] = 'Europe/Dublin'; +$a->strings['Europe/Gibraltar'] = 'Europe/Gibraltar'; +$a->strings['Europe/Guernsey'] = 'Europe/Guernsey'; +$a->strings['Europe/Helsinki'] = 'Europe/Helsinki'; +$a->strings['Europe/Isle_of_Man'] = 'Europe/Isle_of_Man'; +$a->strings['Europe/Istanbul'] = 'Europe/Istanbul'; +$a->strings['Europe/Jersey'] = 'Europe/Jersey'; +$a->strings['Europe/Kaliningrad'] = 'Europe/Kaliningrad'; +$a->strings['Europe/Kiev'] = 'Europe/Kiev'; +$a->strings['Europe/Lisbon'] = 'Europe/Lisbon'; +$a->strings['Europe/Ljubljana'] = 'Europe/Ljubljana'; +$a->strings['Europe/London'] = 'Europe/London'; +$a->strings['Europe/Luxembourg'] = 'Europe/Luxembourg'; +$a->strings['Europe/Madrid'] = 'Europe/Madrid'; +$a->strings['Europe/Malta'] = 'Europe/Malta'; +$a->strings['Europe/Mariehamn'] = 'Europe/Mariehamn'; +$a->strings['Europe/Minsk'] = 'Europe/Minsk'; +$a->strings['Europe/Monaco'] = 'Europe/Monaco'; +$a->strings['Europe/Moscow'] = 'Europe/Moscow'; +$a->strings['Europe/Nicosia'] = 'Europe/Nicosia'; +$a->strings['Europe/Oslo'] = 'Europe/Oslo'; +$a->strings['Europe/Paris'] = 'Europe/Paris'; +$a->strings['Europe/Podgorica'] = 'Europe/Podgorica'; +$a->strings['Europe/Prague'] = 'Europe/Prague'; +$a->strings['Europe/Riga'] = 'Europe/Riga'; +$a->strings['Europe/Rome'] = 'Europe/Rome'; +$a->strings['Europe/Samara'] = 'Europe/Samara'; +$a->strings['Europe/San_Marino'] = 'Europe/San_Marino'; +$a->strings['Europe/Sarajevo'] = 'Europe/Sarajevo'; +$a->strings['Europe/Simferopol'] = 'Europe/Simferopol'; +$a->strings['Europe/Skopje'] = 'Europe/Skopje'; +$a->strings['Europe/Sofia'] = 'Europe/Sofia'; +$a->strings['Europe/Stockholm'] = 'Europe/Stockholm'; +$a->strings['Europe/Tallinn'] = 'Europe/Tallinn'; +$a->strings['Europe/Tirane'] = 'Europe/Tirane'; +$a->strings['Europe/Tiraspol'] = 'Europe/Tiraspol'; +$a->strings['Europe/Uzhgorod'] = 'Europe/Uzhgorod'; +$a->strings['Europe/Vaduz'] = 'Europe/Vaduz'; +$a->strings['Europe/Vatican'] = 'Europe/Vatican'; +$a->strings['Europe/Vienna'] = 'Europe/Vienna'; +$a->strings['Europe/Vilnius'] = 'Europe/Vilnius'; +$a->strings['Europe/Volgograd'] = 'Europe/Volgograd'; +$a->strings['Europe/Warsaw'] = 'Europe/Warsaw'; +$a->strings['Europe/Zagreb'] = 'Europe/Zagreb'; +$a->strings['Europe/Zaporozhye'] = 'Europe/Zaporozhye'; +$a->strings['Europe/Zurich'] = 'Europe/Zurich'; +$a->strings['Factory'] = 'Factory'; +$a->strings['GB'] = 'GB'; +$a->strings['GB-Eire'] = 'GB-Eire'; +$a->strings['GMT'] = 'GMT'; +$a->strings['GMT+0'] = 'GMT+0'; +$a->strings['GMT-0'] = 'GMT-0'; +$a->strings['GMT0'] = 'GMT0'; +$a->strings['Greenwich'] = 'Greenwich'; +$a->strings['Hongkong'] = 'Hongkong'; +$a->strings['HST'] = 'HST'; +$a->strings['Iceland'] = 'Iceland'; +$a->strings['Indian/Antananarivo'] = 'Indian/Antananarivo'; +$a->strings['Indian/Chagos'] = 'Indian/Chagos'; +$a->strings['Indian/Christmas'] = 'Indian/Christmas'; +$a->strings['Indian/Cocos'] = 'Indian/Cocos'; +$a->strings['Indian/Comoro'] = 'Indian/Comoro'; +$a->strings['Indian/Kerguelen'] = 'Indian/Kerguelen'; +$a->strings['Indian/Mahe'] = 'Indian/Mahe'; +$a->strings['Indian/Maldives'] = 'Indian/Maldives'; +$a->strings['Indian/Mauritius'] = 'Indian/Mauritius'; +$a->strings['Indian/Mayotte'] = 'Indian/Mayotte'; +$a->strings['Indian/Reunion'] = 'Indian/Reunion'; +$a->strings['Iran'] = 'Iran'; +$a->strings['Israel'] = 'Israel'; +$a->strings['Jamaica'] = 'Jamaica'; +$a->strings['Japan'] = 'Japan'; +$a->strings['Kwajalein'] = 'Kwajalein'; +$a->strings['Libya'] = 'Libya'; +$a->strings['MET'] = 'MET'; +$a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; +$a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; +$a->strings['Mexico/General'] = 'Mexico/General'; +$a->strings['MST'] = 'MST'; +$a->strings['MST7MDT'] = 'MST7MDT'; +$a->strings['Navajo'] = 'Navajo'; +$a->strings['NZ'] = 'NZ'; +$a->strings['NZ-CHAT'] = 'NZ-CHAT'; +$a->strings['Pacific/Apia'] = 'Pacific/Apia'; +$a->strings['Pacific/Auckland'] = 'Pacific/Auckland'; +$a->strings['Pacific/Chatham'] = 'Pacific/Chatham'; +$a->strings['Pacific/Easter'] = 'Pacific/Easter'; +$a->strings['Pacific/Efate'] = 'Pacific/Efate'; +$a->strings['Pacific/Enderbury'] = 'Pacific/Enderbury'; +$a->strings['Pacific/Fakaofo'] = 'Pacific/Fakaofo'; +$a->strings['Pacific/Fiji'] = 'Pacific/Fiji'; +$a->strings['Pacific/Funafuti'] = 'Pacific/Funafuti'; +$a->strings['Pacific/Galapagos'] = 'Pacific/Galapagos'; +$a->strings['Pacific/Gambier'] = 'Pacific/Gambier'; +$a->strings['Pacific/Guadalcanal'] = 'Pacific/Guadalcanal'; +$a->strings['Pacific/Guam'] = 'Pacific/Guam'; +$a->strings['Pacific/Honolulu'] = 'Pacific/Honolulu'; +$a->strings['Pacific/Johnston'] = 'Pacific/Johnston'; +$a->strings['Pacific/Kiritimati'] = 'Pacific/Kiritimati'; +$a->strings['Pacific/Kosrae'] = 'Pacific/Kosrae'; +$a->strings['Pacific/Kwajalein'] = 'Pacific/Kwajalein'; +$a->strings['Pacific/Majuro'] = 'Pacific/Majuro'; +$a->strings['Pacific/Marquesas'] = 'Pacific/Marquesas'; +$a->strings['Pacific/Midway'] = 'Pacific/Midway'; +$a->strings['Pacific/Nauru'] = 'Pacific/Nauru'; +$a->strings['Pacific/Niue'] = 'Pacific/Niue'; +$a->strings['Pacific/Norfolk'] = 'Pacific/Norfolk'; +$a->strings['Pacific/Noumea'] = 'Pacific/Noumea'; +$a->strings['Pacific/Pago_Pago'] = 'Pacific/Pago_Pago'; +$a->strings['Pacific/Palau'] = 'Pacific/Palau'; +$a->strings['Pacific/Pitcairn'] = 'Pacific/Pitcairn'; +$a->strings['Pacific/Ponape'] = 'Pacific/Ponape'; +$a->strings['Pacific/Port_Moresby'] = 'Pacific/Port_Moresby'; +$a->strings['Pacific/Rarotonga'] = 'Pacific/Rarotonga'; +$a->strings['Pacific/Saipan'] = 'Pacific/Saipan'; +$a->strings['Pacific/Samoa'] = 'Pacific/Samoa'; +$a->strings['Pacific/Tahiti'] = 'Pacific/Tahiti'; +$a->strings['Pacific/Tarawa'] = 'Pacific/Tarawa'; +$a->strings['Pacific/Tongatapu'] = 'Pacific/Tongatapu'; +$a->strings['Pacific/Truk'] = 'Pacific/Truk'; +$a->strings['Pacific/Wake'] = 'Pacific/Wake'; +$a->strings['Pacific/Wallis'] = 'Pacific/Wallis'; +$a->strings['Pacific/Yap'] = 'Pacific/Yap'; +$a->strings['Poland'] = 'Poland'; +$a->strings['Portugal'] = 'Portugal'; +$a->strings['PRC'] = 'PRC'; +$a->strings['PST8PDT'] = 'PST8PDT'; +$a->strings['ROC'] = 'ROC'; +$a->strings['ROK'] = 'ROK'; +$a->strings['Singapore'] = 'Singapore'; +$a->strings['Turkey'] = 'Turkey'; +$a->strings['UCT'] = 'UCT'; +$a->strings['Universal'] = 'Universal'; +$a->strings['US/Alaska'] = 'US/Alaska'; +$a->strings['US/Aleutian'] = 'US/Aleutian'; +$a->strings['US/Arizona'] = 'US/Arizona'; +$a->strings['US/Central'] = 'US/Central'; +$a->strings['US/East-Indiana'] = 'US/East-Indiana'; +$a->strings['US/Eastern'] = 'US/Eastern'; +$a->strings['US/Hawaii'] = 'US/Hawaii'; +$a->strings['US/Indiana-Starke'] = 'US/Indiana-Starke'; +$a->strings['US/Michigan'] = 'US/Michigan'; +$a->strings['US/Mountain'] = 'US/Mountain'; +$a->strings['US/Pacific'] = 'US/Pacific'; +$a->strings['US/Pacific-New'] = 'US/Pacific-New'; +$a->strings['US/Samoa'] = 'US/Samoa'; +$a->strings['UTC'] = 'UTC'; +$a->strings['W-SU'] = 'W-SU'; +$a->strings['WET'] = 'WET'; +$a->strings['Zulu'] = 'Zulu'; diff --git a/view/fr/wall_item_drop.tpl b/view/fr/wall_item_drop.tpl new file mode 100644 index 0000000000..66777db15c --- /dev/null +++ b/view/fr/wall_item_drop.tpl @@ -0,0 +1,2 @@ +
    Delete
    +
    diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl new file mode 100644 index 0000000000..c296de7851 --- /dev/null +++ b/view/fr/wall_received_eml.tpl @@ -0,0 +1,18 @@ + +Dear $username, + + '$from' posted something to your profile wall. + +----- +$body +----- + +Please login at $siteurl to view or delete the item: + +$display + +Thank you, + $sitename administrator + + + diff --git a/view/fr/wallwall_item.tpl b/view/fr/wallwall_item.tpl new file mode 100644 index 0000000000..f8affd1c56 --- /dev/null +++ b/view/fr/wallwall_item.tpl @@ -0,0 +1,36 @@ +
    +
    +
    + + $owner_name +
    +
    Wall-To-Wall
    +
    + + $name +
    + +
    + $lock + $name to $owner_name via Wall-To-Wall:
    +
    $ago
    +
    $location
    + $vote +
    +
    +
    $title
    +
    $body
    +
    + $drop +
    +
    + +
    $dislike
    +
    +
    + $comment +
    +
    + +
    + From 6035f22caf66cde62e97047c4009860a789894be Mon Sep 17 00:00:00 2001 From: olivierm Date: Fri, 21 Jan 2011 11:08:12 +0100 Subject: [PATCH 02/14] More strings translated for french locale. --- view/fr/strings.php | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/view/fr/strings.php b/view/fr/strings.php index 7bc6abb1a4..b5c0039a44 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -92,35 +92,35 @@ $a->strings['Currently blocked'] = 'Actuellement bloqué'; $a->strings['Currently ignored'] = 'Actuellement ignoré'; $a->strings['Show Blocked Connections'] = 'Montrer les connexions bloquées'; $a->strings['Hide Blocked Connections'] = 'Cacher les connexion bloquées'; -// TODO -$a->strings['Finding: '] = 'Finding: '; -$a->strings['Find'] = 'Find'; -$a->strings['Visit '] = 'Visit '; -$a->strings['\'s profile'] = '\'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.'; -$a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: '; -$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully."; -$a->strings['Remote site reported: '] = 'Remote site reported: '; -$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again."; -$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['New mail received at '] = 'New mail received at '; -$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["This introduction has already been accepted."] = "This introduction has already been accepted."; +$a->strings['Finding: '] = 'Trouvé: '; +$a->strings['Find'] = 'Trouver'; +$a->strings['Visit '] = 'Visiter le profil de '; +$a->strings['\'s profile'] = ''; +$a->strings['Edit contact'] = 'Éditer le contact'; +$a->strings['Profile not found.'] = 'Profil introuvable.'; +$a->strings['Response from remote site was not understood.'] = 'Réponse du site distant incomprise.'; +$a->strings['Unexpected response from remote site: '] = 'Réponse inattendue du site distant: '; +$a->strings["Confirmation completed successfully."] = "Confirmation achevée avec succès."; +$a->strings['Remote site reported: '] = 'Alerte du site distant: '; +$a->strings["Temporary failure. Please wait and try again."] = "Échec temporaire. Merci de recommencer ultérieurement."; +$a->strings["Introduction failed or was revoked."] = "Introduction échouée ou annulée."; +$a->strings['Unable to set contact photo.'] = 'Impossible de définir la photo du contact.'; +$a->strings['is now friends with'] = 'est désormais relié à'; +$a->strings['No user record found for '] = 'Pas d\'utilisateur trouvé pour '; +$a->strings['Our site encryption key is apparently messed up.'] = 'Notre clé de chiffrement de site est apparemment corrompue.'; +$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'URL de site absente ou indéchiffrable.'; +$a->strings['Contact record was not found for you on our site.'] = 'Pas d\'entrée pour ce contact sur notre site.'; +$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'L\'identifiant fourni par votre système fait doublon sur le notre. Cela peut fonctionner si vous réessayez.'; +$a->strings['Unable to set your contact credentials on our system.'] = 'Impossible de vous définir des permissions sur notre système.'; +$a->strings['Unable to update your contact profile details on our system'] = 'Impossible de mettre les détails de votre profil à jour sur notre système'; +$a->strings["Connection accepted at "] = "Connexion acceptée à "; +$a->strings['Administrator'] = 'Administrateur'; +$a->strings['New mail received at '] = 'Nouvel email reçu à '; +$a->strings[' commented on an item at '] = ' a commenté une entrée à '; +$a->strings[" commented on an item at "] = " a commenté une entrée à "; +$a->strings[' welcomes '] = ' accueille '; +$a->strings["This introduction has already been accepted."] = "Cette introduction a déjà été acceptée."; +//TODO $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.'; From 0bb7777bfefc53358cc2e21212aef0570f0a2d32 Mon Sep 17 00:00:00 2001 From: olivierm Date: Fri, 21 Jan 2011 18:24:14 +0100 Subject: [PATCH 03/14] Translated more french --- view/fr/strings.php | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/view/fr/strings.php b/view/fr/strings.php index b5c0039a44..aea71143d9 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -120,50 +120,50 @@ $a->strings[' commented on an item at '] = ' a commenté une entrée à '; $a->strings[" commented on an item at "] = " a commenté une entrée à "; $a->strings[' welcomes '] = ' accueille '; $a->strings["This introduction has already been accepted."] = "Cette introduction a déjà été acceptée."; -//TODO -$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['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['Profile location is not valid or does not contain profile information.'] = 'L\'emplacement du profil est invalide ou ne contient pas de profil valide.'; +$a->strings['Warning: profile location has no identifiable owner name.'] = 'Attention: l\'emplacement du profil n\'a pas de nom identifiable.'; +$a->strings['Warning: profile location has no profile photo.'] = 'Attention: l\'emplacement du profil n\'a pas de photo de profil.'; +$a->strings[' required parameter'] = ' paramêtre(s) requis'; +$a->strings[" was "] = " était "; +$a->strings["s were "] = "étaient "; +$a->strings["not found at the given location."] = "introuvable(s) à l\'emplacement indiqué."; +$a->strings["Introduction complete."] = "Phase de présentation achevée."; +$a->strings['Unrecoverable protocol error.'] = 'Erreur de protocole non-récupérable.'; +$a->strings['Profile unavailable.'] = 'Profil indisponible.'; +$a->strings[' has received too many connection requests today.'] = ' a reçu trop de requêtes de connexion aujourd\'hui.'; +$a->strings['Spam protection measures have been invoked.'] = 'Des mesures de protection contre le spam ont été déclenchées.'; +$a->strings['Friends are advised to please try again in 24 hours.'] = 'Les relations sont encouragées à attendre 24 heures pour recommencer.'; +$a->strings["Invalid locator"] = "Localisateur invalide"; +$a->strings["Unable to resolve your name at the provided location."] = "Impossible de résoudre votre nom à l\'emplacement fourni."; +$a->strings['You have already introduced yourself here.'] = 'Vous vous êtes déjà présenté ici.'; $a->strings['Apparently you are already friends with .'] = 'Apparently you are already friends with .'; -$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 this profile."] = "Incorrect identity currently logged in. Please login to this profile."; -$a->strings['[Name Withheld]'] = '[Name Withheld]'; -$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?'; -$a->strings['Yes'] = 'Yes'; -$a->strings['No'] = 'No'; -$a->strings['Add a personal note:'] = 'Add a personal note:'; -$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Please enter your profile address from one of the following supported social networks:'; +$a->strings['Invalid profile URL.'] = 'URL de profil invalide.'; +$a->strings['Disallowed profile URL.'] = 'URL de profil interdite.'; +$a->strings['Your introduction has been sent.'] = 'Votre présentation a été envoyée.'; +$a->strings["Please login to confirm introduction."] = "Connectez-vous pour confirmer l\'introduction."; +$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Identité incorrecte actuellement connectée. Merci de vous connecter à ce profil."; +$a->strings['[Name Withheld]'] = '[Nom non publié]'; +$a->strings['Friend/Connection Request'] = 'Requête de relation/amitié'; +$a->strings['Please answer the following:'] = 'Merci de répondre à ce qui suit:'; +$a->strings['Does $name know you?'] = 'Est-ce que $name vous connaît?'; +$a->strings['Yes'] = 'Oui'; +$a->strings['No'] = 'Non'; +$a->strings['Add a personal note:'] = 'Ajouter une note personnelle:'; +$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Merci d\'entrer l\'adresse de votre profil sur l\'une de ces réseaux sociaux:'; $a->strings['Friendika'] = 'Friendika'; $a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web'; -$a->strings["Private \x28secure\x29 network"] = "Private \x28secure\x29 network"; -$a->strings["Public \x28insecure\x29 network"] = "Public \x28insecure\x29 network"; -$a->strings['Your profile address:'] = 'Your profile address:'; -$a->strings['Submit Request'] = 'Submit Request'; -$a->strings['Cancel'] = 'Cancel'; -$a->strings['Global Directory'] = 'Global Directory'; -$a->strings['Item not found.'] = 'Item not found.'; -$a->strings['Private Message'] = 'Private Message'; -$a->strings['This is you'] = 'This is you'; -$a->strings['View $name\'s profile'] = 'View $name\'s profile'; -$a->strings['Item has been removed.'] = 'Item has been removed.'; +$a->strings["Private \x28secure\x29 network"] = "Réseau privé \x28sécurisé\x29"; +$a->strings["Public \x28insecure\x29 network"] = "Réseau public \x28non-sécurisé\x29"; +$a->strings['Your profile address:'] = 'Votre adresse de profil:'; +$a->strings['Submit Request'] = 'Envoyer la requête'; +$a->strings['Cancel'] = 'Annuler'; +$a->strings['Global Directory'] = 'Annuaire global'; +$a->strings['Item not found.'] = 'Élément introuvable.'; +$a->strings['Private Message'] = 'Message privé'; +$a->strings['This is you'] = 'C\'est vous'; +$a->strings['View $name\'s profile'] = 'Voir le profil de $name'; +$a->strings['Item has been removed.'] = 'Cet élément a été enlevé.'; +//TODO $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.'; From 555a4e2fd8c27f91eedb01ee7a8ebc9eba705732 Mon Sep 17 00:00:00 2001 From: olivierm Date: Fri, 21 Jan 2011 18:39:51 +0100 Subject: [PATCH 04/14] More translation, added FIXME where not completely satisfying. --- view/fr/strings.php | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/view/fr/strings.php b/view/fr/strings.php index aea71143d9..11e0d6ec51 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -163,30 +163,30 @@ $a->strings['Private Message'] = 'Message privé'; $a->strings['This is you'] = 'C\'est vous'; $a->strings['View $name\'s profile'] = 'Voir le profil de $name'; $a->strings['Item has been removed.'] = 'Cet élément a été enlevé.'; -//TODO -$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.'; -$a->strings['following'] = 'following'; -$a->strings['Group created.'] = 'Group created.'; -$a->strings['Could not create group.'] = 'Could not create group.'; -$a->strings['Group not found.'] = 'Group not found.'; -$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['Delete'] = 'Delete'; -$a->strings["Welcome to "] = "Welcome to "; -$a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.'; -$a->strings['Connected to database.'] = 'Connected to database.'; -$a->strings['Database import succeeded.'] = 'Database import succeeded.'; -$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'; -$a->strings['Please see the file "INSTALL.txt".'] = 'Please see the file "INSTALL.txt".'; -$a->strings['Database import failed.'] = 'Database import failed.'; -$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.'; -$a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.'; -$a->strings['Submit'] = 'Submit'; -$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.'; +$a->strings['The profile address specified does not provide adequate information.'] = 'L\'adresse de profil indiquée ne fournit par les informations adéquates.'; +$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Profil limité. Cette personne ne sera pas capable de recevoir des notifications directes/personnelles de votre part.'; +$a->strings['Unable to retrieve contact information.'] = 'Impossible de récupérer les informations du contact.'; +$a->strings['following'] = 'following'; // FIXME +$a->strings['Group created.'] = 'Groupe créé.'; +$a->strings['Could not create group.'] = 'Impossible de créer le groupe.'; +$a->strings['Group not found.'] = 'Groupe introuvable.'; +$a->strings['Group name changed.'] = 'Group renommé.'; +$a->strings['Membership list updated.'] = 'Liste des membres mise à jour.'; +$a->strings['Group removed.'] = 'Groupe enlevé.'; +$a->strings['Unable to remove group.'] = 'Impossible d\'enlever le groupe'; +$a->strings['Delete'] = 'Supprimer'; +$a->strings["Welcome to "] = "Bienvenue à "; +$a->strings['Could not create/connect to database.'] = 'Impossible de créer/atteindre la base de données.'; +$a->strings['Connected to database.'] = 'Connecté à la base de données.'; +$a->strings['Database import succeeded.'] = 'Import de base achevé avec succès.'; +$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le \'poller\'.'; // FIXME +$a->strings['Please see the file "INSTALL.txt".'] = 'Référez-vous au fichier "INSTALL.txt".'; +$a->strings['Database import failed.'] = 'Import de base échoué.'; +$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Vous pourriez avoir besoin d\'importer le fichier "database.sql" manuellement au moyen de phpmyadmin ou de la commande mysql.'; +$a->strings['Welcome to Friendika.'] = 'Bienvenue sur Friendika.'; +$a->strings['Submit'] = 'Envoyer'; +$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Impossible de trouver la version "ligne de commande" de PHP dans le PATH du serveur web.'; +// TODO $a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; $a->strings['This is required for message delivery to work.'] = 'This is required for message delivery to work.'; From 70db9369b47f083b7030352135501807140f05e8 Mon Sep 17 00:00:00 2001 From: olivierm Date: Fri, 21 Jan 2011 21:41:15 +0100 Subject: [PATCH 05/14] A little more... --- view/fr/strings.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/view/fr/strings.php b/view/fr/strings.php index 11e0d6ec51..8117a30e6a 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -186,17 +186,17 @@ $a->strings['You may need to import the file "database.sql" manually using phpmy $a->strings['Welcome to Friendika.'] = 'Bienvenue sur Friendika.'; $a->strings['Submit'] = 'Envoyer'; $a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Impossible de trouver la version "ligne de commande" de PHP dans le PATH du serveur web.'; +$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'Ceci est requis. Merci d\'ajuster la configuration dans le fichier .htconfig.php en conséquence.'; +$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'La version "ligne de commande" de PHP de votre système n\'a pas "register_argc_argv" d\'activé.'; +$a->strings['This is required for message delivery to work.'] = 'Ceci est requis pour que la livraison des messages fonctionne.'; +$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Erreur: la fonction "openssl_pkey_new" de ce système ne permet pas de générer des clés de chiffrement'; +$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'Si vous utilisez Windows, merci de vous réferer à "http://www.php.net/manual/en/openssl.installation.php".'; +$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Erreur: Le module "rewrite" du serveur web Apache est requis mais pas installé.'; +$a->strings['Error: libCURL PHP module required but not installed.'] = 'Erreur: Le module PHP "libCURL" est requis mais pas installé.'; +$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Erreur: Le module PHP "GD" disposant du support JPEG est requis mais pas installé.'; +$a->strings['Error: openssl PHP module required but not installed.'] = 'Erreur: Le module PHP "openssl" est requis mais pas installé.'; +$a->strings['Error: mysqli PHP module required but not installed.'] = 'Erreur: Le module PHP "mysqli" est requis mais pas installé.'; // TODO -$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; -$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; -$a->strings['This is required for message delivery to work.'] = 'This is required for message delivery to work.'; -$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'; -$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'; -$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Error: Apache webserver mod-rewrite module is required but not installed.'; -$a->strings['Error: libCURL PHP module required but not installed.'] = 'Error: libCURL PHP module required but not installed.'; -$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Error: GD graphics PHP module with JPEG support required but not installed.'; -$a->strings['Error: openssl PHP module required but not installed.'] = 'Error: openssl PHP module required but not installed.'; -$a->strings['Error: mysqli PHP module required but not installed.'] = 'Error: mysqli PHP module required but not installed.'; $a->strings['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.'] = '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.'; $a->strings['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.'] = '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.'; $a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Please check with your site documentation or support people to see if this situation can be corrected.'; From 461625e378e8ccf6b66da64c00437da7f65e6dd6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 02:45:37 -0800 Subject: [PATCH 06/14] new network types --- include/notifier.php | 7 ++++++- include/poller.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 39640e51a3..4efdad4ce4 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -280,7 +280,7 @@ ); } break; - default: + case 'stat': if($followup && $contact['notify']) { logger('notifier: slapdelivery: ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$slap); @@ -324,6 +324,11 @@ } } break; + case 'mail': + case 'dspr': + case 'feed': + default: + break; } } diff --git a/include/poller.php b/include/poller.php index fc45ff9c3e..8234becbb9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -35,7 +35,7 @@ // 'stat' clause is a temporary measure until we have federation subscriptions working both directions $contacts = q("SELECT * FROM `contact` WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1))) - OR ( `network` = 'stat' AND `poll` != '' ) ) + OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()"); if(! count($contacts)) From ab62b8f712382f72a0ec2e51812bc8ced299c154 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 03:25:03 -0800 Subject: [PATCH 07/14] fix quotes (again) --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index f1169aeb41..5f8264beb8 100644 --- a/include/items.php +++ b/include/items.php @@ -637,7 +637,7 @@ function item_store($arr) { $arr['body'] = str_replace( array('&amp;', '&gt;', '&lt;', '&quot;'), - array('&' , '>' , '<', '"'), + array('&' , '>' , '<', '"'), $arr['body'] ); From 320059a506f70b9ad78d18135c46718514962236 Mon Sep 17 00:00:00 2001 From: olivierm Date: Sun, 23 Jan 2011 16:49:15 +0100 Subject: [PATCH 08/14] Done timezones + marital statuses and a few time-related translations --- view/fr/strings.php | 952 ++++++++++++++++++++++---------------------- 1 file changed, 476 insertions(+), 476 deletions(-) diff --git a/view/fr/strings.php b/view/fr/strings.php index 8117a30e6a..b67599555d 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -382,457 +382,457 @@ $a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer'; $a->strings['Known to me, but no opinion'] = 'Known to me, but no opinion'; $a->strings['OK, probably harmless'] = 'OK, probably harmless'; $a->strings['Reputable, has my trust'] = 'Reputable, has my trust'; -$a->strings['Frequently'] = 'Frequently'; -$a->strings['Hourly'] = 'Hourly'; -$a->strings['Twice daily'] = 'Twice daily'; -$a->strings['Daily'] = 'Daily'; -$a->strings['Weekly'] = 'Weekly'; -$a->strings['Monthly'] = 'Monthly'; -$a->strings['Miscellaneous'] = 'Miscellaneous'; -$a->strings['less than a second ago'] = 'less than a second ago'; -$a->strings['year'] = 'year'; -$a->strings['years'] = 'years'; -$a->strings['month'] = 'month'; -$a->strings['months'] = 'months'; -$a->strings['week'] = 'week'; -$a->strings['weeks'] = 'weeks'; -$a->strings['day'] = 'day'; -$a->strings['days'] = 'days'; -$a->strings['hour'] = 'hour'; -$a->strings['hours'] = 'hours'; +$a->strings['Frequently'] = 'Fréquemment'; +$a->strings['Hourly'] = 'Toutes les heures'; +$a->strings['Twice daily'] = 'Deux fois par jour'; +$a->strings['Daily'] = 'Chaque jour'; +$a->strings['Weekly'] = 'Chaque semaine'; +$a->strings['Monthly'] = 'Chaque mois'; +$a->strings['Miscellaneous'] = 'Divers'; +$a->strings['less than a second ago'] = 'il y a moins d\'une seconde'; +$a->strings['year'] = 'an'; +$a->strings['years'] = 'ans'; +$a->strings['month'] = 'mois'; +$a->strings['months'] = 'mois'; +$a->strings['week'] = 'semaine'; +$a->strings['weeks'] = 'semaines'; +$a->strings['day'] = 'jour'; +$a->strings['days'] = 'jours'; +$a->strings['hour'] = 'heure'; +$a->strings['hours'] = 'heures'; $a->strings['minute'] = 'minute'; $a->strings['minutes'] = 'minutes'; -$a->strings['second'] = 'second'; -$a->strings['seconds'] = 'seconds'; -$a->strings[' ago'] = ' ago'; -$a->strings['Create a new group'] = 'Create a new group'; -$a->strings['Everybody'] = 'Everybody'; -$a->strings['Birthday:'] = 'Birthday:'; -$a->strings['Logout'] = 'Logout'; -$a->strings['Home'] = 'Home'; -$a->strings['Directory'] = 'Directory'; -$a->strings['Network'] = 'Network'; +$a->strings['second'] = 'seconde'; +$a->strings['seconds'] = 'secondes'; +$a->strings[' ago'] = ' auparavant'; +$a->strings['Create a new group'] = 'Créer un nouveau groupe'; +$a->strings['Everybody'] = 'Tout le monde'; +$a->strings['Birthday:'] = 'Anniversaire:'; +$a->strings['Logout'] = 'Se déconnecter'; +$a->strings['Home'] = 'Accueil'; +$a->strings['Directory'] = 'Annuaire'; +$a->strings['Network'] = 'Réseau'; $a->strings['Notifications'] = 'Notifications'; -$a->strings['Settings'] = 'Settings'; -$a->strings['Profiles'] = 'Profiles'; -$a->strings['Male'] = 'Male'; -$a->strings['Female'] = 'Female'; -$a->strings['Currently Male'] = 'Currently Male'; -$a->strings['Currently Female'] = 'Currently Female'; -$a->strings['Mostly Male'] = 'Mostly Male'; -$a->strings['Mostly Female'] = 'Mostly Female'; -$a->strings['Transgender'] = 'Transgender'; -$a->strings['Intersex'] = 'Intersex'; -$a->strings['Transsexual'] = 'Transsexual'; +$a->strings['Settings'] = 'Réglages'; +$a->strings['Profiles'] = 'Profils'; +$a->strings['Male'] = 'Masculin'; +$a->strings['Female'] = 'Féminin'; +$a->strings['Currently Male'] = 'Actuellement masculin'; +$a->strings['Currently Female'] = 'Actuellement féminin'; +$a->strings['Mostly Male'] = 'Principalement masculin'; +$a->strings['Mostly Female'] = 'Principalement féminin'; +$a->strings['Transgender'] = 'Transgenre'; +$a->strings['Intersex'] = 'Intersexe'; +$a->strings['Transsexual'] = 'Transsexuel'; $a->strings['Hermaphrodite'] = 'Hermaphrodite'; -$a->strings['Neuter'] = 'Neuter'; -$a->strings['Non-specific'] = 'Non-specific'; -$a->strings['Other'] = 'Other'; -$a->strings['Undecided'] = 'Undecided'; -$a->strings['Males'] = 'Males'; -$a->strings['Females'] = 'Females'; +$a->strings['Neuter'] = 'Neutre'; +$a->strings['Non-specific'] = 'Non-spécifique'; +$a->strings['Other'] = 'Autre'; +$a->strings['Undecided'] = 'Indécis'; +$a->strings['Males'] = 'Hommes'; +$a->strings['Females'] = 'Femmes'; $a->strings['Gay'] = 'Gay'; -$a->strings['Lesbian'] = 'Lesbian'; -$a->strings['No Preference'] = 'No Preference'; -$a->strings['Bisexual'] = 'Bisexual'; -$a->strings['Autosexual'] = 'Autosexual'; +$a->strings['Lesbian'] = 'Lesbienne'; +$a->strings['No Preference'] = 'Sans préférence'; +$a->strings['Bisexual'] = 'Bisexuel'; +$a->strings['Autosexual'] = 'Autosexuel'; $a->strings['Abstinent'] = 'Abstinent'; -$a->strings['Virgin'] = 'Virgin'; -$a->strings['Deviant'] = 'Deviant'; -$a->strings['Fetish'] = 'Fetish'; -$a->strings['Oodles'] = 'Oodles'; -$a->strings['Nonsexual'] = 'Nonsexual'; -$a->strings['Single'] = 'Single'; -$a->strings['Lonely'] = 'Lonely'; -$a->strings['Available'] = 'Available'; -$a->strings['Unavailable'] = 'Unavailable'; -$a->strings['Dating'] = 'Dating'; -$a->strings['Unfaithful'] = 'Unfaithful'; -$a->strings['Sex Addict'] = 'Sex Addict'; -$a->strings['Friends'] = 'Friends'; -$a->strings['Friends/Benefits'] = 'Friends/Benefits'; -$a->strings['Casual'] = 'Casual'; -$a->strings['Engaged'] = 'Engaged'; -$a->strings['Married'] = 'Married'; -$a->strings['Partners'] = 'Partners'; -$a->strings['Cohabiting'] = 'Cohabiting'; -$a->strings['Happy'] = 'Happy'; -$a->strings['Not Looking'] = 'Not Looking'; -$a->strings['Swinger'] = 'Swinger'; -$a->strings['Betrayed'] = 'Betrayed'; -$a->strings['Separated'] = 'Separated'; -$a->strings['Unstable'] = 'Unstable'; -$a->strings['Divorced'] = 'Divorced'; -$a->strings['Widowed'] = 'Widowed'; -$a->strings['Uncertain'] = 'Uncertain'; -$a->strings['Complicated'] = 'Complicated'; -$a->strings['Don\'t care'] = 'Don\'t care'; -$a->strings['Ask me'] = 'Ask me'; -$a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; -$a->strings['Africa/Accra'] = 'Africa/Accra'; -$a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; -$a->strings['Africa/Algiers'] = 'Africa/Algiers'; -$a->strings['Africa/Asmara'] = 'Africa/Asmara'; -$a->strings['Africa/Asmera'] = 'Africa/Asmera'; -$a->strings['Africa/Bamako'] = 'Africa/Bamako'; -$a->strings['Africa/Bangui'] = 'Africa/Bangui'; -$a->strings['Africa/Banjul'] = 'Africa/Banjul'; -$a->strings['Africa/Bissau'] = 'Africa/Bissau'; -$a->strings['Africa/Blantyre'] = 'Africa/Blantyre'; -$a->strings['Africa/Brazzaville'] = 'Africa/Brazzaville'; -$a->strings['Africa/Bujumbura'] = 'Africa/Bujumbura'; -$a->strings['Africa/Cairo'] = 'Africa/Cairo'; -$a->strings['Africa/Casablanca'] = 'Africa/Casablanca'; -$a->strings['Africa/Ceuta'] = 'Africa/Ceuta'; -$a->strings['Africa/Conakry'] = 'Africa/Conakry'; -$a->strings['Africa/Dakar'] = 'Africa/Dakar'; -$a->strings['Africa/Dar_es_Salaam'] = 'Africa/Dar_es_Salaam'; -$a->strings['Africa/Djibouti'] = 'Africa/Djibouti'; -$a->strings['Africa/Douala'] = 'Africa/Douala'; -$a->strings['Africa/El_Aaiun'] = 'Africa/El_Aaiun'; -$a->strings['Africa/Freetown'] = 'Africa/Freetown'; -$a->strings['Africa/Gaborone'] = 'Africa/Gaborone'; -$a->strings['Africa/Harare'] = 'Africa/Harare'; -$a->strings['Africa/Johannesburg'] = 'Africa/Johannesburg'; -$a->strings['Africa/Kampala'] = 'Africa/Kampala'; -$a->strings['Africa/Khartoum'] = 'Africa/Khartoum'; -$a->strings['Africa/Kigali'] = 'Africa/Kigali'; -$a->strings['Africa/Kinshasa'] = 'Africa/Kinshasa'; -$a->strings['Africa/Lagos'] = 'Africa/Lagos'; -$a->strings['Africa/Libreville'] = 'Africa/Libreville'; -$a->strings['Africa/Lome'] = 'Africa/Lome'; -$a->strings['Africa/Luanda'] = 'Africa/Luanda'; -$a->strings['Africa/Lubumbashi'] = 'Africa/Lubumbashi'; -$a->strings['Africa/Lusaka'] = 'Africa/Lusaka'; -$a->strings['Africa/Malabo'] = 'Africa/Malabo'; -$a->strings['Africa/Maputo'] = 'Africa/Maputo'; -$a->strings['Africa/Maseru'] = 'Africa/Maseru'; -$a->strings['Africa/Mbabane'] = 'Africa/Mbabane'; -$a->strings['Africa/Mogadishu'] = 'Africa/Mogadishu'; -$a->strings['Africa/Monrovia'] = 'Africa/Monrovia'; -$a->strings['Africa/Nairobi'] = 'Africa/Nairobi'; -$a->strings['Africa/Ndjamena'] = 'Africa/Ndjamena'; -$a->strings['Africa/Niamey'] = 'Africa/Niamey'; -$a->strings['Africa/Nouakchott'] = 'Africa/Nouakchott'; -$a->strings['Africa/Ouagadougou'] = 'Africa/Ouagadougou'; -$a->strings['Africa/Porto-Novo'] = 'Africa/Porto-Novo'; -$a->strings['Africa/Sao_Tome'] = 'Africa/Sao_Tome'; -$a->strings['Africa/Timbuktu'] = 'Africa/Timbuktu'; -$a->strings['Africa/Tripoli'] = 'Africa/Tripoli'; -$a->strings['Africa/Tunis'] = 'Africa/Tunis'; -$a->strings['Africa/Windhoek'] = 'Africa/Windhoek'; -$a->strings['America/Adak'] = 'America/Adak'; -$a->strings['America/Anchorage'] = 'America/Anchorage'; -$a->strings['America/Anguilla'] = 'America/Anguilla'; -$a->strings['America/Antigua'] = 'America/Antigua'; -$a->strings['America/Araguaina'] = 'America/Araguaina'; -$a->strings['America/Argentina/Buenos_Aires'] = 'America/Argentina/Buenos_Aires'; -$a->strings['America/Argentina/Catamarca'] = 'America/Argentina/Catamarca'; -$a->strings['America/Argentina/ComodRivadavia'] = 'America/Argentina/ComodRivadavia'; -$a->strings['America/Argentina/Cordoba'] = 'America/Argentina/Cordoba'; -$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'; -$a->strings['America/Asuncion'] = 'America/Asuncion'; -$a->strings['America/Atikokan'] = 'America/Atikokan'; -$a->strings['America/Atka'] = 'America/Atka'; -$a->strings['America/Bahia'] = 'America/Bahia'; -$a->strings['America/Barbados'] = 'America/Barbados'; -$a->strings['America/Belem'] = 'America/Belem'; -$a->strings['America/Belize'] = 'America/Belize'; -$a->strings['America/Blanc-Sablon'] = 'America/Blanc-Sablon'; -$a->strings['America/Boa_Vista'] = 'America/Boa_Vista'; -$a->strings['America/Bogota'] = 'America/Bogota'; -$a->strings['America/Boise'] = 'America/Boise'; -$a->strings['America/Buenos_Aires'] = 'America/Buenos_Aires'; -$a->strings['America/Cambridge_Bay'] = 'America/Cambridge_Bay'; -$a->strings['America/Campo_Grande'] = 'America/Campo_Grande'; -$a->strings['America/Cancun'] = 'America/Cancun'; -$a->strings['America/Caracas'] = 'America/Caracas'; -$a->strings['America/Catamarca'] = 'America/Catamarca'; -$a->strings['America/Cayenne'] = 'America/Cayenne'; -$a->strings['America/Cayman'] = 'America/Cayman'; -$a->strings['America/Chicago'] = 'America/Chicago'; -$a->strings['America/Chihuahua'] = 'America/Chihuahua'; -$a->strings['America/Coral_Harbour'] = 'America/Coral_Harbour'; -$a->strings['America/Cordoba'] = 'America/Cordoba'; -$a->strings['America/Costa_Rica'] = 'America/Costa_Rica'; -$a->strings['America/Cuiaba'] = 'America/Cuiaba'; -$a->strings['America/Curacao'] = 'America/Curacao'; -$a->strings['America/Danmarkshavn'] = 'America/Danmarkshavn'; -$a->strings['America/Dawson'] = 'America/Dawson'; -$a->strings['America/Dawson_Creek'] = 'America/Dawson_Creek'; -$a->strings['America/Denver'] = 'America/Denver'; -$a->strings['America/Detroit'] = 'America/Detroit'; -$a->strings['America/Dominica'] = 'America/Dominica'; -$a->strings['America/Edmonton'] = 'America/Edmonton'; -$a->strings['America/Eirunepe'] = 'America/Eirunepe'; -$a->strings['America/El_Salvador'] = 'America/El_Salvador'; -$a->strings['America/Ensenada'] = 'America/Ensenada'; -$a->strings['America/Fort_Wayne'] = 'America/Fort_Wayne'; -$a->strings['America/Fortaleza'] = 'America/Fortaleza'; -$a->strings['America/Glace_Bay'] = 'America/Glace_Bay'; -$a->strings['America/Godthab'] = 'America/Godthab'; -$a->strings['America/Goose_Bay'] = 'America/Goose_Bay'; -$a->strings['America/Grand_Turk'] = 'America/Grand_Turk'; -$a->strings['America/Grenada'] = 'America/Grenada'; -$a->strings['America/Guadeloupe'] = 'America/Guadeloupe'; -$a->strings['America/Guatemala'] = 'America/Guatemala'; -$a->strings['America/Guayaquil'] = 'America/Guayaquil'; -$a->strings['America/Guyana'] = 'America/Guyana'; -$a->strings['America/Halifax'] = 'America/Halifax'; -$a->strings['America/Havana'] = 'America/Havana'; -$a->strings['America/Hermosillo'] = 'America/Hermosillo'; -$a->strings['America/Indiana/Indianapolis'] = 'America/Indiana/Indianapolis'; -$a->strings['America/Indiana/Knox'] = 'America/Indiana/Knox'; -$a->strings['America/Indiana/Marengo'] = 'America/Indiana/Marengo'; -$a->strings['America/Indiana/Petersburg'] = 'America/Indiana/Petersburg'; -$a->strings['America/Indiana/Tell_City'] = 'America/Indiana/Tell_City'; -$a->strings['America/Indiana/Vevay'] = 'America/Indiana/Vevay'; -$a->strings['America/Indiana/Vincennes'] = 'America/Indiana/Vincennes'; -$a->strings['America/Indiana/Winamac'] = 'America/Indiana/Winamac'; -$a->strings['America/Indianapolis'] = 'America/Indianapolis'; -$a->strings['America/Inuvik'] = 'America/Inuvik'; -$a->strings['America/Iqaluit'] = 'America/Iqaluit'; -$a->strings['America/Jamaica'] = 'America/Jamaica'; -$a->strings['America/Jujuy'] = 'America/Jujuy'; -$a->strings['America/Juneau'] = 'America/Juneau'; -$a->strings['America/Kentucky/Louisville'] = 'America/Kentucky/Louisville'; -$a->strings['America/Kentucky/Monticello'] = 'America/Kentucky/Monticello'; -$a->strings['America/Knox_IN'] = 'America/Knox_IN'; -$a->strings['America/La_Paz'] = 'America/La_Paz'; -$a->strings['America/Lima'] = 'America/Lima'; -$a->strings['America/Los_Angeles'] = 'America/Los_Angeles'; -$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'; -$a->strings['America/Merida'] = 'America/Merida'; -$a->strings['America/Mexico_City'] = 'America/Mexico_City'; -$a->strings['America/Miquelon'] = 'America/Miquelon'; -$a->strings['America/Moncton'] = 'America/Moncton'; -$a->strings['America/Monterrey'] = 'America/Monterrey'; -$a->strings['America/Montevideo'] = 'America/Montevideo'; -$a->strings['America/Montreal'] = 'America/Montreal'; -$a->strings['America/Montserrat'] = 'America/Montserrat'; -$a->strings['America/Nassau'] = 'America/Nassau'; -$a->strings['America/New_York'] = 'America/New_York'; -$a->strings['America/Nipigon'] = 'America/Nipigon'; -$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'; -$a->strings['America/Phoenix'] = 'America/Phoenix'; -$a->strings['America/Port-au-Prince'] = 'America/Port-au-Prince'; -$a->strings['America/Port_of_Spain'] = 'America/Port_of_Spain'; -$a->strings['America/Porto_Acre'] = 'America/Porto_Acre'; -$a->strings['America/Porto_Velho'] = 'America/Porto_Velho'; -$a->strings['America/Puerto_Rico'] = 'America/Puerto_Rico'; -$a->strings['America/Rainy_River'] = 'America/Rainy_River'; -$a->strings['America/Rankin_Inlet'] = 'America/Rankin_Inlet'; -$a->strings['America/Recife'] = 'America/Recife'; -$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'; -$a->strings['America/St_Thomas'] = 'America/St_Thomas'; -$a->strings['America/St_Vincent'] = 'America/St_Vincent'; -$a->strings['America/Swift_Current'] = 'America/Swift_Current'; -$a->strings['America/Tegucigalpa'] = 'America/Tegucigalpa'; -$a->strings['America/Thule'] = 'America/Thule'; -$a->strings['America/Thunder_Bay'] = 'America/Thunder_Bay'; -$a->strings['America/Tijuana'] = 'America/Tijuana'; -$a->strings['America/Toronto'] = 'America/Toronto'; -$a->strings['America/Tortola'] = 'America/Tortola'; -$a->strings['America/Vancouver'] = 'America/Vancouver'; -$a->strings['America/Virgin'] = 'America/Virgin'; -$a->strings['America/Whitehorse'] = 'America/Whitehorse'; -$a->strings['America/Winnipeg'] = 'America/Winnipeg'; -$a->strings['America/Yakutat'] = 'America/Yakutat'; -$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'; -$a->strings['Antarctica/Rothera'] = 'Antarctica/Rothera'; -$a->strings['Antarctica/South_Pole'] = 'Antarctica/South_Pole'; -$a->strings['Antarctica/Syowa'] = 'Antarctica/Syowa'; -$a->strings['Antarctica/Vostok'] = 'Antarctica/Vostok'; +$a->strings['Virgin'] = 'Vierge'; +$a->strings['Deviant'] = 'Déviant'; +$a->strings['Fetish'] = 'Fétichiste'; +$a->strings['Oodles'] = 'Oodles'; //FIXME +$a->strings['Nonsexual'] = 'Nonsexuel'; +$a->strings['Single'] = 'Célibataire'; +$a->strings['Lonely'] = 'Ésseulé'; +$a->strings['Available'] = 'Disponible'; +$a->strings['Unavailable'] = 'Indisponible'; +$a->strings['Dating'] = 'Dans une relation'; +$a->strings['Unfaithful'] = 'Infidèle'; +$a->strings['Sex Addict'] = 'Accro au sexe'; +$a->strings['Friends'] = 'Amis'; +$a->strings['Friends/Benefits'] = 'Amis par intérêt'; //FIXME +$a->strings['Casual'] = 'Casual'; //FIXME +$a->strings['Engaged'] = 'Fiancé'; +$a->strings['Married'] = 'Marié'; +$a->strings['Partners'] = 'Partenaire'; +$a->strings['Cohabiting'] = 'En cohabitation'; +$a->strings['Happy'] = 'Heureux'; +$a->strings['Not Looking'] = 'Sans recherche'; +$a->strings['Swinger'] = 'Swinger'; //FIXME +$a->strings['Betrayed'] = 'Trahi(e)'; +$a->strings['Separated'] = 'Séparé'; +$a->strings['Unstable'] = 'Instable'; +$a->strings['Divorced'] = 'Divorcé'; +$a->strings['Widowed'] = 'Veuf/Veuve'; +$a->strings['Uncertain'] = 'Incertain'; +$a->strings['Complicated'] = 'Compliqué'; +$a->strings['Don\'t care'] = 'S\'en désinteresse'; //FIXME +$a->strings['Ask me'] = 'Me demander'; +$a->strings['Africa/Abidjan'] = 'Afrique/Abidjan'; +$a->strings['Africa/Accra'] = 'Afrique/Accra'; +$a->strings['Africa/Addis_Ababa'] = 'Afrique/Addis_Ababa'; +$a->strings['Africa/Algiers'] = 'Afrique/Algiers'; +$a->strings['Africa/Asmara'] = 'Afrique/Asmara'; +$a->strings['Africa/Asmera'] = 'Afrique/Asmera'; +$a->strings['Africa/Bamako'] = 'Afrique/Bamako'; +$a->strings['Africa/Bangui'] = 'Afrique/Bangui'; +$a->strings['Africa/Banjul'] = 'Afrique/Banjul'; +$a->strings['Africa/Bissau'] = 'Afrique/Bissau'; +$a->strings['Africa/Blantyre'] = 'Afrique/Blantyre'; +$a->strings['Africa/Brazzaville'] = 'Afrique/Brazzaville'; +$a->strings['Africa/Bujumbura'] = 'Afrique/Bujumbura'; +$a->strings['Africa/Cairo'] = 'Afrique/Le Caire'; +$a->strings['Africa/Casablanca'] = 'Afrique/Casablanca'; +$a->strings['Africa/Ceuta'] = 'Afrique/Ceuta'; +$a->strings['Africa/Conakry'] = 'Afrique/Conakry'; +$a->strings['Africa/Dakar'] = 'Afrique/Dakar'; +$a->strings['Africa/Dar_es_Salaam'] = 'Afrique/Dar_es_Salaam'; +$a->strings['Africa/Djibouti'] = 'Afrique/Djibouti'; +$a->strings['Africa/Douala'] = 'Afrique/Douala'; +$a->strings['Africa/El_Aaiun'] = 'Afrique/El_Aaiun'; +$a->strings['Africa/Freetown'] = 'Afrique/Freetown'; +$a->strings['Africa/Gaborone'] = 'Afrique/Gaborone'; +$a->strings['Africa/Harare'] = 'Afrique/Harare'; +$a->strings['Africa/Johannesburg'] = 'Afrique/Johannesburg'; +$a->strings['Africa/Kampala'] = 'Afrique/Kampala'; +$a->strings['Africa/Khartoum'] = 'Afrique/Khartoum'; +$a->strings['Africa/Kigali'] = 'Afrique/Kigali'; +$a->strings['Africa/Kinshasa'] = 'Afrique/Kinshasa'; +$a->strings['Africa/Lagos'] = 'Afrique/Lagos'; +$a->strings['Africa/Libreville'] = 'Afrique/Libreville'; +$a->strings['Africa/Lome'] = 'Afrique/Lome'; +$a->strings['Africa/Luanda'] = 'Afrique/Luanda'; +$a->strings['Africa/Lubumbashi'] = 'Afrique/Lubumbashi'; +$a->strings['Africa/Lusaka'] = 'Afrique/Lusaka'; +$a->strings['Africa/Malabo'] = 'Afrique/Malabo'; +$a->strings['Africa/Maputo'] = 'Afrique/Maputo'; +$a->strings['Africa/Maseru'] = 'Afrique/Maseru'; +$a->strings['Africa/Mbabane'] = 'Afrique/Mbabane'; +$a->strings['Africa/Mogadishu'] = 'Afrique/Mogadishu'; +$a->strings['Africa/Monrovia'] = 'Afrique/Monrovia'; +$a->strings['Africa/Nairobi'] = 'Afrique/Nairobi'; +$a->strings['Africa/Ndjamena'] = 'Afrique/Ndjamena'; +$a->strings['Africa/Niamey'] = 'Afrique/Niamey'; +$a->strings['Africa/Nouakchott'] = 'Afrique/Nouakchott'; +$a->strings['Africa/Ouagadougou'] = 'Afrique/Ouagadougou'; +$a->strings['Africa/Porto-Novo'] = 'Afrique/Porto-Novo'; +$a->strings['Africa/Sao_Tome'] = 'Afrique/Sao_Tome'; +$a->strings['Africa/Timbuktu'] = 'Afrique/Timbuktu'; +$a->strings['Africa/Tripoli'] = 'Afrique/Tripoli'; +$a->strings['Africa/Tunis'] = 'Afrique/Tunis'; +$a->strings['Africa/Windhoek'] = 'Afrique/Windhoek'; +$a->strings['America/Adak'] = 'Amérique/Adak'; +$a->strings['America/Anchorage'] = 'Amérique/Anchorage'; +$a->strings['America/Anguilla'] = 'Amérique/Anguilla'; +$a->strings['America/Antigua'] = 'Amérique/Antigua'; +$a->strings['America/Araguaina'] = 'Amérique/Araguaina'; +$a->strings['America/Argentina/Buenos_Aires'] = 'Amérique/Argentina/Buenos_Aires'; +$a->strings['America/Argentina/Catamarca'] = 'Amérique/Argentina/Catamarca'; +$a->strings['America/Argentina/ComodRivadavia'] = 'Amérique/Argentina/ComodRivadavia'; +$a->strings['America/Argentina/Cordoba'] = 'Amérique/Argentina/Cordoba'; +$a->strings['America/Argentina/Jujuy'] = 'Amérique/Argentina/Jujuy'; +$a->strings['America/Argentina/La_Rioja'] = 'Amérique/Argentina/La_Rioja'; +$a->strings['America/Argentina/Mendoza'] = 'Amérique/Argentina/Mendoza'; +$a->strings['America/Argentina/Rio_Gallegos'] = 'Amérique/Argentina/Rio_Gallegos'; +$a->strings['America/Argentina/Salta'] = 'Amérique/Argentina/Salta'; +$a->strings['America/Argentina/San_Juan'] = 'Amérique/Argentina/San_Juan'; +$a->strings['America/Argentina/San_Luis'] = 'Amérique/Argentina/San_Luis'; +$a->strings['America/Argentina/Tucuman'] = 'Amérique/Argentina/Tucuman'; +$a->strings['America/Argentina/Ushuaia'] = 'Amérique/Argentina/Ushuaia'; +$a->strings['America/Aruba'] = 'Amérique/Aruba'; +$a->strings['America/Asuncion'] = 'Amérique/Asuncion'; +$a->strings['America/Atikokan'] = 'Amérique/Atikokan'; +$a->strings['America/Atka'] = 'Amérique/Atka'; +$a->strings['America/Bahia'] = 'Amérique/Bahia'; +$a->strings['America/Barbados'] = 'Amérique/Barbados'; +$a->strings['America/Belem'] = 'Amérique/Belem'; +$a->strings['America/Belize'] = 'Amérique/Belize'; +$a->strings['America/Blanc-Sablon'] = 'Amérique/Blanc-Sablon'; +$a->strings['America/Boa_Vista'] = 'Amérique/Boa_Vista'; +$a->strings['America/Bogota'] = 'Amérique/Bogota'; +$a->strings['America/Boise'] = 'Amérique/Boise'; +$a->strings['America/Buenos_Aires'] = 'Amérique/Buenos_Aires'; +$a->strings['America/Cambridge_Bay'] = 'Amérique/Cambridge_Bay'; +$a->strings['America/Campo_Grande'] = 'Amérique/Campo_Grande'; +$a->strings['America/Cancun'] = 'Amérique/Cancun'; +$a->strings['America/Caracas'] = 'Amérique/Caracas'; +$a->strings['America/Catamarca'] = 'Amérique/Catamarca'; +$a->strings['America/Cayenne'] = 'Amérique/Cayenne'; +$a->strings['America/Cayman'] = 'Amérique/Cayman'; +$a->strings['America/Chicago'] = 'Amérique/Chicago'; +$a->strings['America/Chihuahua'] = 'Amérique/Chihuahua'; +$a->strings['America/Coral_Harbour'] = 'Amérique/Coral_Harbour'; +$a->strings['America/Cordoba'] = 'Amérique/Cordoba'; +$a->strings['America/Costa_Rica'] = 'Amérique/Costa_Rica'; +$a->strings['America/Cuiaba'] = 'Amérique/Cuiaba'; +$a->strings['America/Curacao'] = 'Amérique/Curacao'; +$a->strings['America/Danmarkshavn'] = 'Amérique/Danmarkshavn'; +$a->strings['America/Dawson'] = 'Amérique/Dawson'; +$a->strings['America/Dawson_Creek'] = 'Amérique/Dawson_Creek'; +$a->strings['America/Denver'] = 'Amérique/Denver'; +$a->strings['America/Detroit'] = 'Amérique/Detroit'; +$a->strings['America/Dominica'] = 'Amérique/Dominica'; +$a->strings['America/Edmonton'] = 'Amérique/Edmonton'; +$a->strings['America/Eirunepe'] = 'Amérique/Eirunepe'; +$a->strings['America/El_Salvador'] = 'Amérique/El_Salvador'; +$a->strings['America/Ensenada'] = 'Amérique/Ensenada'; +$a->strings['America/Fort_Wayne'] = 'Amérique/Fort_Wayne'; +$a->strings['America/Fortaleza'] = 'Amérique/Fortaleza'; +$a->strings['America/Glace_Bay'] = 'Amérique/Glace_Bay'; +$a->strings['America/Godthab'] = 'Amérique/Godthab'; +$a->strings['America/Goose_Bay'] = 'Amérique/Goose_Bay'; +$a->strings['America/Grand_Turk'] = 'Amérique/Grand_Turk'; +$a->strings['America/Grenada'] = 'Amérique/Grenada'; +$a->strings['America/Guadeloupe'] = 'Amérique/Guadeloupe'; +$a->strings['America/Guatemala'] = 'Amérique/Guatemala'; +$a->strings['America/Guayaquil'] = 'Amérique/Guayaquil'; +$a->strings['America/Guyana'] = 'Amérique/Guyana'; +$a->strings['America/Halifax'] = 'Amérique/Halifax'; +$a->strings['America/Havana'] = 'Amérique/Havana'; +$a->strings['America/Hermosillo'] = 'Amérique/Hermosillo'; +$a->strings['America/Indiana/Indianapolis'] = 'Amérique/Indiana/Indianapolis'; +$a->strings['America/Indiana/Knox'] = 'Amérique/Indiana/Knox'; +$a->strings['America/Indiana/Marengo'] = 'Amérique/Indiana/Marengo'; +$a->strings['America/Indiana/Petersburg'] = 'Amérique/Indiana/Petersburg'; +$a->strings['America/Indiana/Tell_City'] = 'Amérique/Indiana/Tell_City'; +$a->strings['America/Indiana/Vevay'] = 'Amérique/Indiana/Vevay'; +$a->strings['America/Indiana/Vincennes'] = 'Amérique/Indiana/Vincennes'; +$a->strings['America/Indiana/Winamac'] = 'Amérique/Indiana/Winamac'; +$a->strings['America/Indianapolis'] = 'Amérique/Indianapolis'; +$a->strings['America/Inuvik'] = 'Amérique/Inuvik'; +$a->strings['America/Iqaluit'] = 'Amérique/Iqaluit'; +$a->strings['America/Jamaica'] = 'Amérique/Jamaica'; +$a->strings['America/Jujuy'] = 'Amérique/Jujuy'; +$a->strings['America/Juneau'] = 'Amérique/Juneau'; +$a->strings['America/Kentucky/Louisville'] = 'Amérique/Kentucky/Louisville'; +$a->strings['America/Kentucky/Monticello'] = 'Amérique/Kentucky/Monticello'; +$a->strings['America/Knox_IN'] = 'Amérique/Knox_IN'; +$a->strings['America/La_Paz'] = 'Amérique/La_Paz'; +$a->strings['America/Lima'] = 'Amérique/Lima'; +$a->strings['America/Los_Angeles'] = 'Amérique/Los_Angeles'; +$a->strings['America/Louisville'] = 'Amérique/Louisville'; +$a->strings['America/Maceio'] = 'Amérique/Maceio'; +$a->strings['America/Managua'] = 'Amérique/Managua'; +$a->strings['America/Manaus'] = 'Amérique/Manaus'; +$a->strings['America/Marigot'] = 'Amérique/Marigot'; +$a->strings['America/Martinique'] = 'Amérique/Martinique'; +$a->strings['America/Matamoros'] = 'Amérique/Matamoros'; +$a->strings['America/Mazatlan'] = 'Amérique/Mazatlan'; +$a->strings['America/Mendoza'] = 'Amérique/Mendoza'; +$a->strings['America/Menominee'] = 'Amérique/Menominee'; +$a->strings['America/Merida'] = 'Amérique/Merida'; +$a->strings['America/Mexico_City'] = 'Amérique/Mexico_City'; +$a->strings['America/Miquelon'] = 'Amérique/Miquelon'; +$a->strings['America/Moncton'] = 'Amérique/Moncton'; +$a->strings['America/Monterrey'] = 'Amérique/Monterrey'; +$a->strings['America/Montevideo'] = 'Amérique/Montevideo'; +$a->strings['America/Montreal'] = 'Amérique/Montréal'; +$a->strings['America/Montserrat'] = 'Amérique/Montserrat'; +$a->strings['America/Nassau'] = 'Amérique/Nassau'; +$a->strings['America/New_York'] = 'Amérique/New_York'; +$a->strings['America/Nipigon'] = 'Amérique/Nipigon'; +$a->strings['America/Nome'] = 'Amérique/Nome'; +$a->strings['America/Noronha'] = 'Amérique/Noronha'; +$a->strings['America/North_Dakota/Center'] = 'Amérique/North_Dakota/Center'; +$a->strings['America/North_Dakota/New_Salem'] = 'Amérique/North_Dakota/New_Salem'; +$a->strings['America/Ojinaga'] = 'Amérique/Ojinaga'; +$a->strings['America/Panama'] = 'Amérique/Panama'; +$a->strings['America/Pangnirtung'] = 'Amérique/Pangnirtung'; +$a->strings['America/Paramaribo'] = 'Amérique/Paramaribo'; +$a->strings['America/Phoenix'] = 'Amérique/Phoenix'; +$a->strings['America/Port-au-Prince'] = 'Amérique/Port-au-Prince'; +$a->strings['America/Port_of_Spain'] = 'Amérique/Port_of_Spain'; +$a->strings['America/Porto_Acre'] = 'Amérique/Porto_Acre'; +$a->strings['America/Porto_Velho'] = 'Amérique/Porto_Velho'; +$a->strings['America/Puerto_Rico'] = 'Amérique/Puerto_Rico'; +$a->strings['America/Rainy_River'] = 'Amérique/Rainy_River'; +$a->strings['America/Rankin_Inlet'] = 'Amérique/Rankin_Inlet'; +$a->strings['America/Recife'] = 'Amérique/Recife'; +$a->strings['America/Regina'] = 'Amérique/Regina'; +$a->strings['America/Resolute'] = 'Amérique/Resolute'; +$a->strings['America/Rio_Branco'] = 'Amérique/Rio_Branco'; +$a->strings['America/Rosario'] = 'Amérique/Rosario'; +$a->strings['America/Santa_Isabel'] = 'Amérique/Santa_Isabel'; +$a->strings['America/Santarem'] = 'Amérique/Santarem'; +$a->strings['America/Santiago'] = 'Amérique/Santiago'; +$a->strings['America/Santo_Domingo'] = 'Amérique/Santo_Domingo'; +$a->strings['America/Sao_Paulo'] = 'Amérique/Sao_Paulo'; +$a->strings['America/Scoresbysund'] = 'Amérique/Scoresbysund'; +$a->strings['America/Shiprock'] = 'Amérique/Shiprock'; +$a->strings['America/St_Barthelemy'] = 'Amérique/St_Barthelemy'; +$a->strings['America/St_Johns'] = 'Amérique/St_Johns'; +$a->strings['America/St_Kitts'] = 'Amérique/St_Kitts'; +$a->strings['America/St_Lucia'] = 'Amérique/St_Lucia'; +$a->strings['America/St_Thomas'] = 'Amérique/St_Thomas'; +$a->strings['America/St_Vincent'] = 'Amérique/St_Vincent'; +$a->strings['America/Swift_Current'] = 'Amérique/Swift_Current'; +$a->strings['America/Tegucigalpa'] = 'Amérique/Tegucigalpa'; +$a->strings['America/Thule'] = 'Amérique/Thule'; +$a->strings['America/Thunder_Bay'] = 'Amérique/Thunder_Bay'; +$a->strings['America/Tijuana'] = 'Amérique/Tijuana'; +$a->strings['America/Toronto'] = 'Amérique/Toronto'; +$a->strings['America/Tortola'] = 'Amérique/Tortola'; +$a->strings['America/Vancouver'] = 'Amérique/Vancouver'; +$a->strings['America/Virgin'] = 'Amérique/Virgin'; +$a->strings['America/Whitehorse'] = 'Amérique/Whitehorse'; +$a->strings['America/Winnipeg'] = 'Amérique/Winnipeg'; +$a->strings['America/Yakutat'] = 'Amérique/Yakutat'; +$a->strings['America/Yellowknife'] = 'Amérique/Yellowknife'; +$a->strings['Antarctica/Casey'] = 'Antarctique/Casey'; +$a->strings['Antarctica/Davis'] = 'Antarctique/Davis'; +$a->strings['Antarctica/DumontDUrville'] = 'Antarctique/Dumont d\'Urville'; +$a->strings['Antarctica/Macquarie'] = 'Antarctique/Macquarie'; +$a->strings['Antarctica/Mawson'] = 'Antarctique/Mawson'; +$a->strings['Antarctica/McMurdo'] = 'Antarctique/McMurdo'; +$a->strings['Antarctica/Palmer'] = 'Antarctique/Palmer'; +$a->strings['Antarctica/Rothera'] = 'Antarctique/Rothera'; +$a->strings['Antarctica/South_Pole'] = 'Antarctique/Pôle Sud'; +$a->strings['Antarctica/Syowa'] = 'Antarctique/Syowa'; +$a->strings['Antarctica/Vostok'] = 'Antarctique/Vostok'; $a->strings['Arctic/Longyearbyen'] = 'Arctic/Longyearbyen'; -$a->strings['Asia/Aden'] = 'Asia/Aden'; -$a->strings['Asia/Almaty'] = 'Asia/Almaty'; -$a->strings['Asia/Amman'] = 'Asia/Amman'; -$a->strings['Asia/Anadyr'] = 'Asia/Anadyr'; -$a->strings['Asia/Aqtau'] = 'Asia/Aqtau'; -$a->strings['Asia/Aqtobe'] = 'Asia/Aqtobe'; -$a->strings['Asia/Ashgabat'] = 'Asia/Ashgabat'; -$a->strings['Asia/Ashkhabad'] = 'Asia/Ashkhabad'; -$a->strings['Asia/Baghdad'] = 'Asia/Baghdad'; -$a->strings['Asia/Bahrain'] = 'Asia/Bahrain'; -$a->strings['Asia/Baku'] = 'Asia/Baku'; -$a->strings['Asia/Bangkok'] = 'Asia/Bangkok'; -$a->strings['Asia/Beirut'] = 'Asia/Beirut'; -$a->strings['Asia/Bishkek'] = 'Asia/Bishkek'; -$a->strings['Asia/Brunei'] = 'Asia/Brunei'; -$a->strings['Asia/Calcutta'] = 'Asia/Calcutta'; -$a->strings['Asia/Choibalsan'] = 'Asia/Choibalsan'; -$a->strings['Asia/Chongqing'] = 'Asia/Chongqing'; -$a->strings['Asia/Chungking'] = 'Asia/Chungking'; -$a->strings['Asia/Colombo'] = 'Asia/Colombo'; -$a->strings['Asia/Dacca'] = 'Asia/Dacca'; -$a->strings['Asia/Damascus'] = 'Asia/Damascus'; -$a->strings['Asia/Dhaka'] = 'Asia/Dhaka'; -$a->strings['Asia/Dili'] = 'Asia/Dili'; -$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'; -$a->strings['Asia/Istanbul'] = 'Asia/Istanbul'; -$a->strings['Asia/Jakarta'] = 'Asia/Jakarta'; -$a->strings['Asia/Jayapura'] = 'Asia/Jayapura'; -$a->strings['Asia/Jerusalem'] = 'Asia/Jerusalem'; -$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'; -$a->strings['Asia/Kuwait'] = 'Asia/Kuwait'; -$a->strings['Asia/Macao'] = 'Asia/Macao'; -$a->strings['Asia/Macau'] = 'Asia/Macau'; -$a->strings['Asia/Magadan'] = 'Asia/Magadan'; -$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'; -$a->strings['Asia/Phnom_Penh'] = 'Asia/Phnom_Penh'; -$a->strings['Asia/Pontianak'] = 'Asia/Pontianak'; -$a->strings['Asia/Pyongyang'] = 'Asia/Pyongyang'; -$a->strings['Asia/Qatar'] = 'Asia/Qatar'; -$a->strings['Asia/Qyzylorda'] = 'Asia/Qyzylorda'; -$a->strings['Asia/Rangoon'] = 'Asia/Rangoon'; -$a->strings['Asia/Riyadh'] = 'Asia/Riyadh'; -$a->strings['Asia/Saigon'] = 'Asia/Saigon'; -$a->strings['Asia/Sakhalin'] = 'Asia/Sakhalin'; -$a->strings['Asia/Samarkand'] = 'Asia/Samarkand'; -$a->strings['Asia/Seoul'] = 'Asia/Seoul'; -$a->strings['Asia/Shanghai'] = 'Asia/Shanghai'; -$a->strings['Asia/Singapore'] = 'Asia/Singapore'; -$a->strings['Asia/Taipei'] = 'Asia/Taipei'; -$a->strings['Asia/Tashkent'] = 'Asia/Tashkent'; -$a->strings['Asia/Tbilisi'] = 'Asia/Tbilisi'; -$a->strings['Asia/Tehran'] = 'Asia/Tehran'; -$a->strings['Asia/Tel_Aviv'] = 'Asia/Tel_Aviv'; -$a->strings['Asia/Thimbu'] = 'Asia/Thimbu'; -$a->strings['Asia/Thimphu'] = 'Asia/Thimphu'; -$a->strings['Asia/Tokyo'] = 'Asia/Tokyo'; -$a->strings['Asia/Ujung_Pandang'] = 'Asia/Ujung_Pandang'; -$a->strings['Asia/Ulaanbaatar'] = 'Asia/Ulaanbaatar'; -$a->strings['Asia/Ulan_Bator'] = 'Asia/Ulan_Bator'; -$a->strings['Asia/Urumqi'] = 'Asia/Urumqi'; -$a->strings['Asia/Vientiane'] = 'Asia/Vientiane'; -$a->strings['Asia/Vladivostok'] = 'Asia/Vladivostok'; -$a->strings['Asia/Yakutsk'] = 'Asia/Yakutsk'; -$a->strings['Asia/Yekaterinburg'] = 'Asia/Yekaterinburg'; -$a->strings['Asia/Yerevan'] = 'Asia/Yerevan'; -$a->strings['Atlantic/Azores'] = 'Atlantic/Azores'; -$a->strings['Atlantic/Bermuda'] = 'Atlantic/Bermuda'; -$a->strings['Atlantic/Canary'] = 'Atlantic/Canary'; -$a->strings['Atlantic/Cape_Verde'] = 'Atlantic/Cape_Verde'; -$a->strings['Atlantic/Faeroe'] = 'Atlantic/Faeroe'; -$a->strings['Atlantic/Faroe'] = 'Atlantic/Faroe'; -$a->strings['Atlantic/Jan_Mayen'] = 'Atlantic/Jan_Mayen'; -$a->strings['Atlantic/Madeira'] = 'Atlantic/Madeira'; -$a->strings['Atlantic/Reykjavik'] = 'Atlantic/Reykjavik'; -$a->strings['Atlantic/South_Georgia'] = 'Atlantic/South_Georgia'; -$a->strings['Atlantic/St_Helena'] = 'Atlantic/St_Helena'; -$a->strings['Atlantic/Stanley'] = 'Atlantic/Stanley'; -$a->strings['Australia/ACT'] = 'Australia/ACT'; -$a->strings['Australia/Adelaide'] = 'Australia/Adelaide'; -$a->strings['Australia/Brisbane'] = 'Australia/Brisbane'; -$a->strings['Australia/Broken_Hill'] = 'Australia/Broken_Hill'; -$a->strings['Australia/Canberra'] = 'Australia/Canberra'; -$a->strings['Australia/Currie'] = 'Australia/Currie'; -$a->strings['Australia/Darwin'] = 'Australia/Darwin'; -$a->strings['Australia/Eucla'] = 'Australia/Eucla'; -$a->strings['Australia/Hobart'] = 'Australia/Hobart'; -$a->strings['Australia/LHI'] = 'Australia/LHI'; -$a->strings['Australia/Lindeman'] = 'Australia/Lindeman'; -$a->strings['Australia/Lord_Howe'] = 'Australia/Lord_Howe'; -$a->strings['Australia/Melbourne'] = 'Australia/Melbourne'; -$a->strings['Australia/North'] = 'Australia/North'; -$a->strings['Australia/NSW'] = 'Australia/NSW'; -$a->strings['Australia/Perth'] = 'Australia/Perth'; -$a->strings['Australia/Queensland'] = 'Australia/Queensland'; -$a->strings['Australia/South'] = 'Australia/South'; -$a->strings['Australia/Sydney'] = 'Australia/Sydney'; -$a->strings['Australia/Tasmania'] = 'Australia/Tasmania'; -$a->strings['Australia/Victoria'] = 'Australia/Victoria'; -$a->strings['Australia/West'] = 'Australia/West'; -$a->strings['Australia/Yancowinna'] = 'Australia/Yancowinna'; -$a->strings['Brazil/Acre'] = 'Brazil/Acre'; -$a->strings['Brazil/DeNoronha'] = 'Brazil/DeNoronha'; -$a->strings['Brazil/East'] = 'Brazil/East'; -$a->strings['Brazil/West'] = 'Brazil/West'; -$a->strings['Canada/Atlantic'] = 'Canada/Atlantic'; +$a->strings['Asia/Aden'] = 'Asie/Aden'; +$a->strings['Asia/Almaty'] = 'Asie/Almaty'; +$a->strings['Asia/Amman'] = 'Asie/Amman'; +$a->strings['Asia/Anadyr'] = 'Asie/Anadyr'; +$a->strings['Asia/Aqtau'] = 'Asie/Aqtau'; +$a->strings['Asia/Aqtobe'] = 'Asie/Aqtobe'; +$a->strings['Asia/Ashgabat'] = 'Asie/Ashgabat'; +$a->strings['Asia/Ashkhabad'] = 'Asie/Ashkhabad'; +$a->strings['Asia/Baghdad'] = 'Asie/Baghdad'; +$a->strings['Asia/Bahrain'] = 'Asie/Bahrain'; +$a->strings['Asia/Baku'] = 'Asie/Baku'; +$a->strings['Asia/Bangkok'] = 'Asie/Bangkok'; +$a->strings['Asia/Beirut'] = 'Asie/Beirut'; +$a->strings['Asia/Bishkek'] = 'Asie/Bishkek'; +$a->strings['Asia/Brunei'] = 'Asie/Brunei'; +$a->strings['Asia/Calcutta'] = 'Asie/Calcutta'; +$a->strings['Asia/Choibalsan'] = 'Asie/Choibalsan'; +$a->strings['Asia/Chongqing'] = 'Asie/Chongqing'; +$a->strings['Asia/Chungking'] = 'Asie/Chungking'; +$a->strings['Asia/Colombo'] = 'Asie/Colombo'; +$a->strings['Asia/Dacca'] = 'Asie/Dacca'; +$a->strings['Asia/Damascus'] = 'Asie/Damascus'; +$a->strings['Asia/Dhaka'] = 'Asie/Dhaka'; +$a->strings['Asia/Dili'] = 'Asie/Dili'; +$a->strings['Asia/Dubai'] = 'Asie/Dubai'; +$a->strings['Asia/Dushanbe'] = 'Asie/Dushanbe'; +$a->strings['Asia/Gaza'] = 'Asie/Gaza'; +$a->strings['Asia/Harbin'] = 'Asie/Harbin'; +$a->strings['Asia/Ho_Chi_Minh'] = 'Asie/Ho_Chi_Minh'; +$a->strings['Asia/Hong_Kong'] = 'Asie/Hong_Kong'; +$a->strings['Asia/Hovd'] = 'Asie/Hovd'; +$a->strings['Asia/Irkutsk'] = 'Asie/Irkutsk'; +$a->strings['Asia/Istanbul'] = 'Asie/Istanbul'; +$a->strings['Asia/Jakarta'] = 'Asie/Jakarta'; +$a->strings['Asia/Jayapura'] = 'Asie/Jayapura'; +$a->strings['Asia/Jerusalem'] = 'Asie/Jerusalem'; +$a->strings['Asia/Kabul'] = 'Asie/Kabul'; +$a->strings['Asia/Kamchatka'] = 'Asie/Kamchatka'; +$a->strings['Asia/Karachi'] = 'Asie/Karachi'; +$a->strings['Asia/Kashgar'] = 'Asie/Kashgar'; +$a->strings['Asia/Kathmandu'] = 'Asie/Kathmandu'; +$a->strings['Asia/Katmandu'] = 'Asie/Katmandu'; +$a->strings['Asia/Kolkata'] = 'Asie/Kolkata'; +$a->strings['Asia/Krasnoyarsk'] = 'Asie/Krasnoyarsk'; +$a->strings['Asia/Kuala_Lumpur'] = 'Asie/Kuala_Lumpur'; +$a->strings['Asia/Kuching'] = 'Asie/Kuching'; +$a->strings['Asia/Kuwait'] = 'Asie/Kuwait'; +$a->strings['Asia/Macao'] = 'Asie/Macao'; +$a->strings['Asia/Macau'] = 'Asie/Macau'; +$a->strings['Asia/Magadan'] = 'Asie/Magadan'; +$a->strings['Asia/Makassar'] = 'Asie/Makassar'; +$a->strings['Asia/Manila'] = 'Asie/Manila'; +$a->strings['Asia/Muscat'] = 'Asie/Muscat'; +$a->strings['Asia/Nicosia'] = 'Asie/Nicosia'; +$a->strings['Asia/Novokuznetsk'] = 'Asie/Novokuznetsk'; +$a->strings['Asia/Novosibirsk'] = 'Asie/Novosibirsk'; +$a->strings['Asia/Omsk'] = 'Asie/Omsk'; +$a->strings['Asia/Oral'] = 'Asie/Oral'; +$a->strings['Asia/Phnom_Penh'] = 'Asie/Phnom_Penh'; +$a->strings['Asia/Pontianak'] = 'Asie/Pontianak'; +$a->strings['Asia/Pyongyang'] = 'Asie/Pyongyang'; +$a->strings['Asia/Qatar'] = 'Asie/Qatar'; +$a->strings['Asia/Qyzylorda'] = 'Asie/Qyzylorda'; +$a->strings['Asia/Rangoon'] = 'Asie/Rangoon'; +$a->strings['Asia/Riyadh'] = 'Asie/Riyadh'; +$a->strings['Asia/Saigon'] = 'Asie/Saigon'; +$a->strings['Asia/Sakhalin'] = 'Asie/Sakhalin'; +$a->strings['Asia/Samarkand'] = 'Asie/Samarkand'; +$a->strings['Asia/Seoul'] = 'Asie/Seoul'; +$a->strings['Asia/Shanghai'] = 'Asie/Shanghai'; +$a->strings['Asia/Singapore'] = 'Asie/Singapore'; +$a->strings['Asia/Taipei'] = 'Asie/Taipei'; +$a->strings['Asia/Tashkent'] = 'Asie/Tashkent'; +$a->strings['Asia/Tbilisi'] = 'Asie/Tbilisi'; +$a->strings['Asia/Tehran'] = 'Asie/Tehran'; +$a->strings['Asia/Tel_Aviv'] = 'Asie/Tel_Aviv'; +$a->strings['Asia/Thimbu'] = 'Asie/Thimbu'; +$a->strings['Asia/Thimphu'] = 'Asie/Thimphu'; +$a->strings['Asia/Tokyo'] = 'Asie/Tokyo'; +$a->strings['Asia/Ujung_Pandang'] = 'Asie/Ujung_Pandang'; +$a->strings['Asia/Ulaanbaatar'] = 'Asie/Ulaanbaatar'; +$a->strings['Asia/Ulan_Bator'] = 'Asie/Ulan_Bator'; +$a->strings['Asia/Urumqi'] = 'Asie/Urumqi'; +$a->strings['Asia/Vientiane'] = 'Asie/Vientiane'; +$a->strings['Asia/Vladivostok'] = 'Asie/Vladivostok'; +$a->strings['Asia/Yakutsk'] = 'Asie/Yakutsk'; +$a->strings['Asia/Yekaterinburg'] = 'Asie/Yekaterinburg'; +$a->strings['Asia/Yerevan'] = 'Asie/Yerevan'; +$a->strings['Atlantic/Azores'] = 'Atlantique/Azores'; +$a->strings['Atlantic/Bermuda'] = 'Atlantique/Bermuda'; +$a->strings['Atlantic/Canary'] = 'Atlantique/Canary'; +$a->strings['Atlantic/Cape_Verde'] = 'Atlantique/Cape_Verde'; +$a->strings['Atlantic/Faeroe'] = 'Atlantique/Faeroe'; +$a->strings['Atlantic/Faroe'] = 'Atlantique/Faroe'; +$a->strings['Atlantic/Jan_Mayen'] = 'Atlantique/Jan_Mayen'; +$a->strings['Atlantic/Madeira'] = 'Atlantique/Madeira'; +$a->strings['Atlantic/Reykjavik'] = 'Atlantique/Reykjavik'; +$a->strings['Atlantic/South_Georgia'] = 'Atlantique/South_Georgia'; +$a->strings['Atlantic/St_Helena'] = 'Atlantique/St_Helena'; +$a->strings['Atlantic/Stanley'] = 'Atlantique/Stanley'; +$a->strings['Australia/ACT'] = 'Australie/ACT'; +$a->strings['Australia/Adelaide'] = 'Australie/Adelaide'; +$a->strings['Australia/Brisbane'] = 'Australie/Brisbane'; +$a->strings['Australia/Broken_Hill'] = 'Australie/Broken_Hill'; +$a->strings['Australia/Canberra'] = 'Australie/Canberra'; +$a->strings['Australia/Currie'] = 'Australie/Currie'; +$a->strings['Australia/Darwin'] = 'Australie/Darwin'; +$a->strings['Australia/Eucla'] = 'Australie/Eucla'; +$a->strings['Australia/Hobart'] = 'Australie/Hobart'; +$a->strings['Australia/LHI'] = 'Australie/LHI'; +$a->strings['Australia/Lindeman'] = 'Australie/Lindeman'; +$a->strings['Australia/Lord_Howe'] = 'Australie/Lord_Howe'; +$a->strings['Australia/Melbourne'] = 'Australie/Melbourne'; +$a->strings['Australia/North'] = 'Australie/North'; +$a->strings['Australia/NSW'] = 'Australie/NSW'; +$a->strings['Australia/Perth'] = 'Australie/Perth'; +$a->strings['Australia/Queensland'] = 'Australie/Queensland'; +$a->strings['Australia/South'] = 'Australie/South'; +$a->strings['Australia/Sydney'] = 'Australie/Sydney'; +$a->strings['Australia/Tasmania'] = 'Australie/Tasmania'; +$a->strings['Australia/Victoria'] = 'Australie/Victoria'; +$a->strings['Australia/West'] = 'Australie/West'; +$a->strings['Australia/Yancowinna'] = 'Australie/Yancowinna'; +$a->strings['Brazil/Acre'] = 'Brésil/Acre'; +$a->strings['Brazil/DeNoronha'] = 'Brésil/DeNoronha'; +$a->strings['Brazil/East'] = 'Brésil/Est'; +$a->strings['Brazil/West'] = 'Brésil/Ouest'; +$a->strings['Canada/Atlantic'] = 'Canada/Atlantique'; $a->strings['Canada/Central'] = 'Canada/Central'; $a->strings['Canada/East-Saskatchewan'] = 'Canada/East-Saskatchewan'; $a->strings['Canada/Eastern'] = 'Canada/Eastern'; $a->strings['Canada/Mountain'] = 'Canada/Mountain'; -$a->strings['Canada/Newfoundland'] = 'Canada/Newfoundland'; -$a->strings['Canada/Pacific'] = 'Canada/Pacific'; +$a->strings['Canada/Newfoundland'] = 'Canada/Terre-Neuve'; +$a->strings['Canada/Pacific'] = 'Canada/Pacifique'; $a->strings['Canada/Saskatchewan'] = 'Canada/Saskatchewan'; $a->strings['Canada/Yukon'] = 'Canada/Yukon'; $a->strings['CET'] = 'CET'; -$a->strings['Chile/Continental'] = 'Chile/Continental'; -$a->strings['Chile/EasterIsland'] = 'Chile/EasterIsland'; +$a->strings['Chile/Continental'] = 'Chili/Continental'; +$a->strings['Chile/EasterIsland'] = 'Chili/EasterIsland'; $a->strings['CST6CDT'] = 'CST6CDT'; $a->strings['Cuba'] = 'Cuba'; $a->strings['EET'] = 'EET'; -$a->strings['Egypt'] = 'Egypt'; +$a->strings['Egypt'] = 'Égypte'; $a->strings['Eire'] = 'Eire'; $a->strings['EST'] = 'EST'; $a->strings['EST5EDT'] = 'EST5EDT'; @@ -868,7 +868,7 @@ $a->strings['Etc/GMT-9'] = 'Etc/GMT-9'; $a->strings['Etc/GMT0'] = 'Etc/GMT0'; $a->strings['Etc/Greenwich'] = 'Etc/Greenwich'; $a->strings['Etc/UCT'] = 'Etc/UCT'; -$a->strings['Etc/Universal'] = 'Etc/Universal'; +$a->strings['Etc/Universal'] = 'Etc/Universel'; $a->strings['Etc/UTC'] = 'Etc/UTC'; $a->strings['Etc/Zulu'] = 'Etc/Zulu'; $a->strings['Europe/Amsterdam'] = 'Europe/Amsterdam'; @@ -930,8 +930,8 @@ $a->strings['Europe/Zagreb'] = 'Europe/Zagreb'; $a->strings['Europe/Zaporozhye'] = 'Europe/Zaporozhye'; $a->strings['Europe/Zurich'] = 'Europe/Zurich'; $a->strings['Factory'] = 'Factory'; -$a->strings['GB'] = 'GB'; -$a->strings['GB-Eire'] = 'GB-Eire'; +$a->strings['GB'] = 'Grande Bretagne'; +$a->strings['GB-Eire'] = 'Grande Bretagne-Eire'; $a->strings['GMT'] = 'GMT'; $a->strings['GMT+0'] = 'GMT+0'; $a->strings['GMT-0'] = 'GMT-0'; @@ -939,47 +939,47 @@ $a->strings['GMT0'] = 'GMT0'; $a->strings['Greenwich'] = 'Greenwich'; $a->strings['Hongkong'] = 'Hongkong'; $a->strings['HST'] = 'HST'; -$a->strings['Iceland'] = 'Iceland'; -$a->strings['Indian/Antananarivo'] = 'Indian/Antananarivo'; -$a->strings['Indian/Chagos'] = 'Indian/Chagos'; -$a->strings['Indian/Christmas'] = 'Indian/Christmas'; -$a->strings['Indian/Cocos'] = 'Indian/Cocos'; -$a->strings['Indian/Comoro'] = 'Indian/Comoro'; -$a->strings['Indian/Kerguelen'] = 'Indian/Kerguelen'; -$a->strings['Indian/Mahe'] = 'Indian/Mahe'; -$a->strings['Indian/Maldives'] = 'Indian/Maldives'; -$a->strings['Indian/Mauritius'] = 'Indian/Mauritius'; -$a->strings['Indian/Mayotte'] = 'Indian/Mayotte'; -$a->strings['Indian/Reunion'] = 'Indian/Reunion'; +$a->strings['Iceland'] = 'Islande'; +$a->strings['Indian/Antananarivo'] = 'Océan Indien/Antananarivo'; +$a->strings['Indian/Chagos'] = 'Océan Indien/Chagos'; +$a->strings['Indian/Christmas'] = 'Océan Indien/Christmas'; +$a->strings['Indian/Cocos'] = 'Océan Indien/Cocos'; +$a->strings['Indian/Comoro'] = 'Océan Indien/Comoro'; +$a->strings['Indian/Kerguelen'] = 'Océen Indien/Kerguelen'; +$a->strings['Indian/Mahe'] = 'Océan Indien/Mahe'; +$a->strings['Indian/Maldives'] = 'Océan Indien/Maldives'; +$a->strings['Indian/Mauritius'] = 'Océan Indien/Mauritius'; +$a->strings['Indian/Mayotte'] = 'Océan Indien/Mayotte'; +$a->strings['Indian/Reunion'] = 'OcéanIndien/Réunion'; $a->strings['Iran'] = 'Iran'; -$a->strings['Israel'] = 'Israel'; -$a->strings['Jamaica'] = 'Jamaica'; -$a->strings['Japan'] = 'Japan'; +$a->strings['Israel'] = 'Israël'; +$a->strings['Jamaica'] = 'Jamaïque'; +$a->strings['Japan'] = 'Japon'; $a->strings['Kwajalein'] = 'Kwajalein'; -$a->strings['Libya'] = 'Libya'; +$a->strings['Libya'] = 'Libye'; $a->strings['MET'] = 'MET'; -$a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; -$a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; -$a->strings['Mexico/General'] = 'Mexico/General'; +$a->strings['Mexico/BajaNorte'] = 'Mexique/BajaNorte'; +$a->strings['Mexico/BajaSur'] = 'Mexique/BajaSur'; +$a->strings['Mexico/General'] = 'Mexique/General'; $a->strings['MST'] = 'MST'; $a->strings['MST7MDT'] = 'MST7MDT'; $a->strings['Navajo'] = 'Navajo'; $a->strings['NZ'] = 'NZ'; $a->strings['NZ-CHAT'] = 'NZ-CHAT'; -$a->strings['Pacific/Apia'] = 'Pacific/Apia'; -$a->strings['Pacific/Auckland'] = 'Pacific/Auckland'; -$a->strings['Pacific/Chatham'] = 'Pacific/Chatham'; -$a->strings['Pacific/Easter'] = 'Pacific/Easter'; -$a->strings['Pacific/Efate'] = 'Pacific/Efate'; -$a->strings['Pacific/Enderbury'] = 'Pacific/Enderbury'; -$a->strings['Pacific/Fakaofo'] = 'Pacific/Fakaofo'; -$a->strings['Pacific/Fiji'] = 'Pacific/Fiji'; -$a->strings['Pacific/Funafuti'] = 'Pacific/Funafuti'; -$a->strings['Pacific/Galapagos'] = 'Pacific/Galapagos'; -$a->strings['Pacific/Gambier'] = 'Pacific/Gambier'; -$a->strings['Pacific/Guadalcanal'] = 'Pacific/Guadalcanal'; -$a->strings['Pacific/Guam'] = 'Pacific/Guam'; -$a->strings['Pacific/Honolulu'] = 'Pacific/Honolulu'; +$a->strings['Pacific/Apia'] = 'Pacifique/Apia'; +$a->strings['Pacific/Auckland'] = 'Pacifique/Auckland'; +$a->strings['Pacific/Chatham'] = 'Pacifique/Chatham'; +$a->strings['Pacific/Easter'] = 'Pacifique/Easter'; +$a->strings['Pacific/Efate'] = 'Pacifique/Efate'; +$a->strings['Pacific/Enderbury'] = 'Pacifique/Enderbury'; +$a->strings['Pacific/Fakaofo'] = 'Pacifique/Fakaofo'; +$a->strings['Pacific/Fiji'] = 'Pacifique/Fidji'; +$a->strings['Pacific/Funafuti'] = 'Pacifique/Funafuti'; +$a->strings['Pacific/Galapagos'] = 'Pacifique/Galapagos'; +$a->strings['Pacific/Gambier'] = 'Pacifique/Gambier'; +$a->strings['Pacific/Guadalcanal'] = 'Pacifique/Guadalcanal'; +$a->strings['Pacific/Guam'] = 'Pacifique/Guam'; +$a->strings['Pacific/Honolulu'] = 'Pacifique/Honolulu'; $a->strings['Pacific/Johnston'] = 'Pacific/Johnston'; $a->strings['Pacific/Kiritimati'] = 'Pacific/Kiritimati'; $a->strings['Pacific/Kosrae'] = 'Pacific/Kosrae'; @@ -1006,18 +1006,18 @@ $a->strings['Pacific/Truk'] = 'Pacific/Truk'; $a->strings['Pacific/Wake'] = 'Pacific/Wake'; $a->strings['Pacific/Wallis'] = 'Pacific/Wallis'; $a->strings['Pacific/Yap'] = 'Pacific/Yap'; -$a->strings['Poland'] = 'Poland'; +$a->strings['Poland'] = 'Pologne'; $a->strings['Portugal'] = 'Portugal'; $a->strings['PRC'] = 'PRC'; $a->strings['PST8PDT'] = 'PST8PDT'; $a->strings['ROC'] = 'ROC'; $a->strings['ROK'] = 'ROK'; -$a->strings['Singapore'] = 'Singapore'; -$a->strings['Turkey'] = 'Turkey'; +$a->strings['Singapore'] = 'Singapour'; +$a->strings['Turkey'] = 'Turquie'; $a->strings['UCT'] = 'UCT'; -$a->strings['Universal'] = 'Universal'; +$a->strings['Universal'] = 'Universel'; $a->strings['US/Alaska'] = 'US/Alaska'; -$a->strings['US/Aleutian'] = 'US/Aleutian'; +$a->strings['US/Aleutian'] = 'US/Aléoutiennes'; $a->strings['US/Arizona'] = 'US/Arizona'; $a->strings['US/Central'] = 'US/Central'; $a->strings['US/East-Indiana'] = 'US/East-Indiana'; @@ -1026,7 +1026,7 @@ $a->strings['US/Hawaii'] = 'US/Hawaii'; $a->strings['US/Indiana-Starke'] = 'US/Indiana-Starke'; $a->strings['US/Michigan'] = 'US/Michigan'; $a->strings['US/Mountain'] = 'US/Mountain'; -$a->strings['US/Pacific'] = 'US/Pacific'; +$a->strings['US/Pacific'] = 'US/Pacifique'; $a->strings['US/Pacific-New'] = 'US/Pacific-New'; $a->strings['US/Samoa'] = 'US/Samoa'; $a->strings['UTC'] = 'UTC'; From 950e5f6693907c76821b4da99cd4e3b080c4ae23 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 13:49:21 -0800 Subject: [PATCH 09/14] given a tag @foo, don't also link/replace words like food in msg body --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index f9bf9a04e0..f964e7737d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -228,7 +228,7 @@ function item_post(&$a) { } } if($profile) { - $body = str_replace($name,'[url=' . $profile . ']' . $newname . '[/url]', $body); + $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname . '[/url]', $body); $profile = str_replace(',','%2c',$profile); if(strlen($str_tags)) $str_tags .= ','; From 1100d7b9580cf717f28750f7c39a2db6ff551299 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 14:35:22 -0800 Subject: [PATCH 10/14] sync template updates en => fr --- view/fr/profile_advanced.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/fr/profile_advanced.php b/view/fr/profile_advanced.php index 9aee6c2627..f2c8913830 100644 --- a/view/fr/profile_advanced.php +++ b/view/fr/profile_advanced.php @@ -39,8 +39,8 @@ EOT; $o .= '
    ' . ((intval($a->profile['dob'])) - ? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')) - : day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F'))) + ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'],'j F, Y')) + : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6),'j F'))) . "
    \r\n"; $o .= '
    '; From 1460fc0d710ce14d6c746eb06fc8f3a5372493c2 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 14:56:14 -0800 Subject: [PATCH 11/14] add cc-license text to all content pages --- mod/display.php | 3 +++ mod/network.php | 4 +++- mod/profile.php | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index de11ec35d6..aed114abc2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -291,6 +291,9 @@ function display_content(&$a) { } } + + $o .= '
    ' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
    '; + return $o; } diff --git a/mod/network.php b/mod/network.php index 096c8a79ff..f9badda78b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -430,8 +430,10 @@ function network_content(&$a, $update = 0) { } } - if(! $update) + if(! $update) { $o .= paginate($a); + $o .= '
    ' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
    '; + } return $o; } \ No newline at end of file diff --git a/mod/profile.php b/mod/profile.php index 9363793604..505edf5ced 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -379,6 +379,8 @@ function profile_content(&$a, $update = 0) { } $o .= paginate($a); + $o .= '
    ' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
    '; + return $o; } From 00d2b583588ea1c55e9b478809e8041d6ba98639 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 16:29:30 -0800 Subject: [PATCH 12/14] fix a few issues with code blocks, ignore tags within blocks, fold multi-line blocks to one, also turn html br into two LFs. --- boot.php | 5 +++++ mod/item.php | 4 ++++ .../tiny_mce/plugins/bbcode/editor_plugin_src.js | 5 +++-- .../themes/advanced/skins/default/content.css | 12 ++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 05b33abd6e..45fd8d16fe 100644 --- a/boot.php +++ b/boot.php @@ -1687,6 +1687,11 @@ function activity_match($haystack,$needle) { if(! function_exists('get_tags')) { function get_tags($s) { $ret = array(); + + // ignore anything in a code block + + $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); + if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) { foreach($match[1] as $match) { if(strstr($match,"]")) { diff --git a/mod/item.php b/mod/item.php index f964e7737d..feef7c95f8 100644 --- a/mod/item.php +++ b/mod/item.php @@ -165,7 +165,11 @@ function item_post(&$a) { } } + /** + * Fold multi-line [code] sequences + */ + $body = preg_replace('/\[\/code\]\s*\[code\]/m',"\n",$body); /** * Look for any tags and linkify them diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js index 8728f0c0f3..f12975ba21 100644 --- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js @@ -64,8 +64,8 @@ rep(//gi,"[u]"); rep(/]*>/gi,"[quote]"); rep(/<\/blockquote>/gi,"[/quote]"); - rep(/
    /gi,"\n"); - rep(//gi,"\n"); + rep(/
    /gi,"\n\n"); + rep(//gi,"\n\n"); rep(/
    /gi,"\n"); rep(/

    /gi,""); rep(/<\/p>/gi,"\n"); @@ -98,6 +98,7 @@ rep(/\[url\](.*?)\[\/url\]/gi,"$1"); rep(/\[img\](.*?)\[\/img\]/gi,""); rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); +// rep(/\[\/code\]\s*\[code\]/gi,"
    "); // fold multiline code rep(/\[code\](.*?)\[\/code\]/gi,"$1"); rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"

    $1
    "); diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css index 36f38aba29..444063a828 100644 --- a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +++ b/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css @@ -18,6 +18,18 @@ del {color:red; text-decoration:line-through} cite {border-bottom:1px dashed blue} acronym {border-bottom:1px dotted #CCC; cursor:help} abbr {border-bottom:1px dashed #CCC; cursor:help} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} + /* IE */ * html body { From 5be98e3ec8b0475dc67504967cac695d9e4a129a Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 20:09:34 -0800 Subject: [PATCH 13/14] following random feeds --- include/Scrape.php | 30 ++++++++++++++++++++++++++ include/poller.php | 10 ++++++++- mod/follow.php | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/include/Scrape.php b/include/Scrape.php index 10ec54d134..8478ea4071 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -22,6 +22,8 @@ function scrape_dfrn($url) { foreach($items as $item) { $x = $item->getAttribute('rel'); + if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml')) + $ret['feed_atom'] = $item->getAttribute('href'); if(substr($x,0,5) == "dfrn-") $ret[$x] = $item->getAttribute('href'); if($x === 'lrdd') { @@ -135,3 +137,31 @@ function scrape_vcard($url) { return $ret; }} + + +if(! function_exists('scrape_feed')) { +function scrape_feed($url) { + + $ret = array(); + $s = fetch_url($url); + + if(! $s) + return $ret; + + $dom = HTML5_Parser::parse($s); + + if(! $dom) + return $ret; + + $items = $dom->getElementsByTagName('link'); + + // get Atom link elements + + foreach($items as $item) { + $x = $item->getAttribute('rel'); + if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml')) + $ret['feed_atom'] = $item->getAttribute('href'); + } + + return $ret; +}} \ No newline at end of file diff --git a/include/poller.php b/include/poller.php index 8234becbb9..024b9fbcd3 100644 --- a/include/poller.php +++ b/include/poller.php @@ -32,10 +32,18 @@ if(($argc > 1) && ($argv[1] == 'force')) $force = true; + if(($argc > 1) && intval($argv[1])) { + $manual_id = intval($argv[1]); + $force = true; + } + + $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); + // 'stat' clause is a temporary measure until we have federation subscriptions working both directions $contacts = q("SELECT * FROM `contact` WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1))) - OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) + OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) + $sql_extra AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()"); if(! count($contacts)) diff --git a/mod/follow.php b/mod/follow.php index 14bdb9fc6d..e5eb7763bf 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -48,6 +48,8 @@ function follow_post(&$a) { } } + $network = 'stat'; + if($hcard) { $vcard = scrape_vcard($hcard); @@ -63,13 +65,58 @@ function follow_post(&$a) { if(! $profile) $profile = $url; - // do we have enough information? if(! x($vcard,'fn')) if(x($vcard,'nick')) $vcard['fn'] = $vcard['nick']; + if((! isset($vcard)) && (! $poll)) { + + $ret = scrape_feed($url); + + if(count($ret) && $ret['feed_atom']) { + $poll = $ret['feed_atom']; + $vcard = array(); + require_once('simplepie/simplepie.inc'); + $feed = new SimplePie(); + $xml = fetch_url($poll); + + $feed->set_raw_data($xml); + + $feed->init(); + + $vcard['photo'] = $feed->get_image_url(); + $author = $feed->get_author(); + if($author) { + $vcard['fn'] = trim($author->get_name()); + $vcard['nick'] = strtolower($vcard['fn']); + if(strpos($vcard['nick'],' ')) + $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); + $email = $author->get_email(); + } + else { + $item = $feed->get_item(0); + if($item) { + $author = $item->get_author(); + if($author) { + $vcard['fn'] = trim($author->get_name()); + $vcard['nick'] = strtolower($vcard['fn']); + if(strpos($vcard['nick'],' ')) + $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); + $email = $author->get_email(); + } + } + } + if((! $vcard['photo']) && strlen($email)) + $vcard['photo'] = gravatar_img($email); + $network = 'feed'; + } + } + logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true)); + + + // do we have enough information? if(! ((x($vcard['fn'])) && ($poll) && ($profile))) { notice( t('The profile address specified does not provide adequate information.') . EOL); @@ -115,7 +162,7 @@ function follow_post(&$a) { dbesc($vcard['fn']), dbesc($vcard['nick']), dbesc($vcard['photo']), - dbesc('stat'), + dbesc($network), intval(REL_FAN) ); } @@ -158,6 +205,9 @@ function follow_post(&$a) { // pull feed and consume it, which should subscribe to the hub. + $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); + proc_close(proc_open("\"$php_path\" \"include/poller.php\" \"$contact_id\" &", array(), $foo)); + // create a follow slap From 205a2b8930c9d519c06f106d5d37702f8f69d013 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 23 Jan 2011 21:26:09 -0800 Subject: [PATCH 14/14] owner's sparkle link, sometimes not author's - on display page --- mod/display.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index aed114abc2..3215ae90a0 100644 --- a/mod/display.php +++ b/mod/display.php @@ -173,6 +173,9 @@ function display_content(&$a) { $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; + // I think this is redundant now but too chicken to remove it unless + // I've had six cups of coffee and tested it completely + if(($item['network'] === 'dfrn') && (! $item['self'] )) { $profile_url = $redirect_url; $sparkle = ' sparkle'; @@ -216,7 +219,18 @@ function display_content(&$a) { $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']); - $profile_link = $profile_url; + // Can we use our special contact URL for this author? + + if(strlen($item['author-link'])) { + if((link_compare($item['author-link'],$item['url'])) && ($item['network'] === 'dfrn') && (! $item['self'])) { + $profile_link = $redirect_url; + $sparkle = ' sparkle'; + } + else { + $profile_link = $item['author-link']; + $sparkle = ''; + } + } if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));