It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:383 ../../mod/directory.php:91 +#: ../../mod/profiles.php:421 ../../mod/directory.php:91 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:418 ../../include/nav.php:110 +#: ../../mod/profiles.php:456 ../../include/nav.php:110 msgid "Profiles" msgstr "" -#: ../../mod/profiles.php:419 +#: ../../mod/profiles.php:457 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:420 +#: ../../mod/profiles.php:458 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:432 +#: ../../mod/profiles.php:470 msgid "Profile Image" msgstr "" @@ -2195,6 +2577,82 @@ msgstr "" msgid "Send public postings to Twitter" msgstr "" +#: ../../include/profile_advanced.php:23 ../../boot.php:2300 +msgid "Gender:" +msgstr "" + +#: ../../include/profile_advanced.php:36 ../../include/items.php:1073 +msgid "Birthday:" +msgstr "" + +#: ../../include/profile_advanced.php:45 +msgid "j F, Y" +msgstr "" + +#: ../../include/profile_advanced.php:46 +msgid "j F" +msgstr "" + +#: ../../include/profile_advanced.php:59 +msgid "Age:" +msgstr "" + +#: ../../include/profile_advanced.php:70 +msgid "♥ Status:" +msgstr "" + +#: ../../include/profile_advanced.php:103 ../../boot.php:2306 +msgid "Homepage:" +msgstr "" + +#: ../../include/profile_advanced.php:115 +msgid "Policial Views:" +msgstr "" + +#: ../../include/profile_advanced.php:127 +msgid "Religion:" +msgstr "" + +#: ../../include/profile_advanced.php:138 +msgid "About:" +msgstr "" + +#: ../../include/profile_advanced.php:150 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../include/profile_advanced.php:162 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/profile_advanced.php:174 +msgid "Musical interests:" +msgstr "" + +#: ../../include/profile_advanced.php:186 +msgid "Books, literature:" +msgstr "" + +#: ../../include/profile_advanced.php:198 +msgid "Television:" +msgstr "" + +#: ../../include/profile_advanced.php:210 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/profile_advanced.php:222 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/profile_advanced.php:234 +msgid "Work/employment:" +msgstr "" + +#: ../../include/profile_advanced.php:246 +msgid "School/education:" +msgstr "" + #: ../../include/contact_selectors.php:32 msgid "Unknown | Not categorised" msgstr "" @@ -2543,10 +3001,6 @@ msgstr "" msgid "day" msgstr "" -#: ../../include/datetime.php:154 -msgid "days" -msgstr "" - #: ../../include/datetime.php:155 msgid "hour" msgstr "" @@ -2592,10 +3046,6 @@ msgstr "" msgid "Except For:" msgstr "" -#: ../../include/items.php:1073 -msgid "Birthday:" -msgstr "" - #: ../../include/items.php:1418 msgid "You have a new follower at " msgstr "" @@ -2628,10 +3078,6 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:831 -msgid "Password Reset" -msgstr "" - #: ../../boot.php:1083 msgid "prev" msgstr "" @@ -2710,18 +3156,10 @@ msgstr "" msgid ", " msgstr "" -#: ../../boot.php:2300 -msgid "Gender:" -msgstr "" - #: ../../boot.php:2304 msgid "Status:" msgstr "" -#: ../../boot.php:2306 -msgid "Homepage:" -msgstr "" - #: ../../boot.php:2397 msgid "Monday" msgstr "" diff --git a/util/strings.php b/util/strings.php index 9ee31768d2..14e0c64ee0 100644 --- a/util/strings.php +++ b/util/strings.php @@ -117,6 +117,14 @@ $a->strings['Never'] = 'Never'; $a->strings["\x28Update was successful\x29"] = "\x28Update was successful\x29"; $a->strings["\x28Update was not successful\x29"] = "\x28Update was not successful\x29"; $a->strings['Contact Editor'] = 'Contact Editor'; +$a->strings['Submit'] = 'Submit'; +$a->strings['Profile Visibility'] = 'Profile Visibility'; +$a->strings['Please choose the profile you would like to display to %s when viewing your profile securely.'] = 'Please choose the profile you would like to display to %s when viewing your profile securely.'; +$a->strings['Contact Information / Notes'] = 'Contact Information / Notes'; +$a->strings['Online Reputation'] = 'Online Reputation'; +$a->strings['Occasionally your friends may wish to inquire about this person\'s online legitimacy.'] = 'Occasionally your friends may wish to inquire about this person\'s online legitimacy.'; +$a->strings['You may help them choose whether or not to interact with this person by providing a reputation to guide them.'] = 'You may help them choose whether or not to interact with this person by providing a reputation to guide them.'; +$a->strings['Please take a moment to elaborate on this selection if you feel it could be helpful to others.'] = 'Please take a moment to elaborate on this selection if you feel it could be helpful to others.'; $a->strings['Visit $name\'s profile'] = 'Visit $name\'s profile'; $a->strings['Block/Unblock contact'] = 'Block/Unblock contact'; $a->strings['Ignore contact'] = 'Ignore contact'; @@ -193,7 +201,6 @@ $a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\ $a->strings['Share'] = 'Share'; $a->strings['Please wait'] = 'Please wait'; $a->strings['This is you'] = 'This is you'; -$a->strings['Submit'] = 'Submit'; $a->strings['Edit'] = 'Edit'; $a->strings['Delete'] = 'Delete'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; @@ -249,6 +256,16 @@ $a->strings['Proceed to registration'] = 'Proceed to registration'; $a->strings['Database import failed.'] = 'Database import failed.'; $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.'; $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.'; +$a->strings['Friendika Social Network'] = 'Friendika Social Network'; +$a->strings['Installation'] = 'Installation'; +$a->strings['In order to install Friendika we need to know how to contact your database.'] = 'In order to install Friendika we need to know how to contact your database.'; +$a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Please contact your hosting provider or site administrator if you have questions about these settings.'; +$a->strings['The database you specify below must already exist. If it does not, please create it before continuing.'] = 'The database you specify below must already exist. If it does not, please create it before continuing.'; +$a->strings['Database Server Name'] = 'Database Server Name'; +$a->strings['Database Login Name'] = 'Database Login Name'; +$a->strings['Database Login Password'] = 'Database Login Password'; +$a->strings['Database Name'] = 'Database Name'; +$a->strings['Please select a default timezone for your website'] = 'Please select a default timezone for your website'; $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.'; @@ -296,6 +313,11 @@ $a->strings['Visible to:'] = 'Visible to:'; $a->strings['Password reset request issued. Check your email.'] = 'Password reset request issued. Check your email.'; $a->strings['Password reset requested at %s'] = 'Password reset requested at %s'; $a->strings["Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."] = "Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."; +$a->strings['Your password has been reset as requested.'] = 'Your password has been reset as requested.'; +$a->strings['Your new password is'] = 'Your new password is'; +$a->strings['Save or copy your new password - and then'] = 'Save or copy your new password - and then'; +$a->strings['click here to login'] = 'click here to login'; +$a->strings['Your password may be changed from the Settings page after successful login.'] = 'Your password may be changed from the Settings page after successful login.'; $a->strings['Forgot your Password?'] = 'Forgot your Password?'; $a->strings['Enter your email address and submit to have your password reset. Then check your email for further instructions.'] = 'Enter your email address and submit to have your password reset. Then check your email for further instructions.'; $a->strings['Nickname or Email: '] = 'Nickname or Email: '; @@ -408,6 +430,11 @@ $a->strings['Profile'] = 'Profile'; $a->strings['Photos'] = 'Photos'; $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.'; $a->strings['Unable to process image'] = 'Unable to process image'; +$a->strings['Upload File:'] = 'Upload File:'; +$a->strings['Upload Profile Photo'] = 'Upload Profile Photo'; +$a->strings['Upload'] = 'Upload'; +$a->strings['or'] = 'or'; +$a->strings['select a photo from your photo albums'] = 'select a photo from your photo albums'; $a->strings['Crop Image'] = 'Crop Image'; $a->strings['Please adjust the image cropping for optimum viewing.'] = 'Please adjust the image cropping for optimum viewing.'; $a->strings['Done Editing'] = 'Done Editing'; @@ -419,6 +446,43 @@ $a->strings['Profile-'] = 'Profile-'; $a->strings['New profile created.'] = 'New profile created.'; $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.'; $a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?'; +$a->strings['Edit Profile Details'] = 'Edit Profile Details'; +$a->strings['View this profile'] = 'View this profile'; +$a->strings['Create a new profile using these settings'] = 'Create a new profile using these settings'; +$a->strings['Clone this profile'] = 'Clone this profile'; +$a->strings['Delete this profile'] = 'Delete this profile'; +$a->strings['Profile Name:'] = 'Profile Name:'; +$a->strings['Your Full Name:'] = 'Your Full Name:'; +$a->strings['Title/Description:'] = 'Title/Description:'; +$a->strings['Your Gender:'] = 'Your Gender:'; +$a->strings["Birthday \x28y/m/d\x29:"] = "Birthday \x28y/m/d\x29:"; +$a->strings['Street Address:'] = 'Street Address:'; +$a->strings['Locality/City:'] = 'Locality/City:'; +$a->strings['Postal/Zip Code:'] = 'Postal/Zip Code:'; +$a->strings['Country:'] = 'Country:'; +$a->strings['Region/State:'] = 'Region/State:'; +$a->strings['♥ Marital Status:'] = '♥ Marital Status:'; +$a->strings["Who: \x28if applicable\x29"] = "Who: \x28if applicable\x29"; +$a->strings['Examples: cathy123, Cathy Williams, cathy@example.com'] = 'Examples: cathy123, Cathy Williams, cathy@example.com'; +$a->strings['Sexual Preference:'] = 'Sexual Preference:'; +$a->strings['Homepage URL:'] = 'Homepage URL:'; +$a->strings['Political Views:'] = 'Political Views:'; +$a->strings['Religious Views:'] = 'Religious Views:'; +$a->strings['Public Keywords:'] = 'Public Keywords:'; +$a->strings['Private Keywords:'] = 'Private Keywords:'; +$a->strings['Example: fishing photography software'] = 'Example: fishing photography software'; +$a->strings["\x28Used for suggesting potential friends, can be seen by others\x29"] = "\x28Used for suggesting potential friends, can be seen by others\x29"; +$a->strings["\x28Used for searching profiles, never shown to others\x29"] = "\x28Used for searching profiles, never shown to others\x29"; +$a->strings['Tell us about yourself...'] = 'Tell us about yourself...'; +$a->strings['Hobbies/Interests'] = 'Hobbies/Interests'; +$a->strings['Contact information and Social Networks'] = 'Contact information and Social Networks'; +$a->strings['Musical interests'] = 'Musical interests'; +$a->strings['Books, literature'] = 'Books, literature'; +$a->strings['Television'] = 'Television'; +$a->strings['Film/dance/culture/entertainment'] = 'Film/dance/culture/entertainment'; +$a->strings['Love/romance'] = 'Love/romance'; +$a->strings['Work/employment'] = 'Work/employment'; +$a->strings['School/education'] = 'School/education'; $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['Profiles'] = 'Profiles'; $a->strings['Change profile photo'] = 'Change profile photo'; @@ -482,7 +546,33 @@ $a->strings[" \x28Optional\x29 Allow this OpenID to login to this account." $a->strings['Publish your default profile in site directory?'] = 'Publish your default profile in site directory?'; $a->strings['Publish your default profile in global social directory?'] = 'Publish your default profile in global social directory?'; $a->strings['Profile is not published.'] = 'Profile is not published.'; +$a->strings['Your profile address is'] = 'Your profile address is'; $a->strings['Export Personal Data'] = 'Export Personal Data'; +$a->strings['Basic Settings'] = 'Basic Settings'; +$a->strings['Full Name:'] = 'Full Name:'; +$a->strings['Email Address:'] = 'Email Address:'; +$a->strings['Your Timezone:'] = 'Your Timezone:'; +$a->strings['Default Post Location:'] = 'Default Post Location:'; +$a->strings['Use Browser Location:'] = 'Use Browser Location:'; +$a->strings['Display Theme:'] = 'Display Theme:'; +$a->strings['Security and Privacy Settings'] = 'Security and Privacy Settings'; +$a->strings['Maximum Friend Requests/Day:'] = 'Maximum Friend Requests/Day:'; +$a->strings["\x28to prevent spam abuse\x29"] = "\x28to prevent spam abuse\x29"; +$a->strings['Allow friends to post to your profile page:'] = 'Allow friends to post to your profile page:'; +$a->strings["Automatically expire \x28delete\x29 posts older than"] = "Automatically expire \x28delete\x29 posts older than"; +$a->strings['days'] = 'days'; +$a->strings['Notification Settings'] = 'Notification Settings'; +$a->strings['Send a notification email when:'] = 'Send a notification email when:'; +$a->strings['You receive an introduction'] = 'You receive an introduction'; +$a->strings['Your introductions are confirmed'] = 'Your introductions are confirmed'; +$a->strings['Someone writes on your profile wall'] = 'Someone writes on your profile wall'; +$a->strings['Someone writes a followup comment'] = 'Someone writes a followup comment'; +$a->strings['You receive a private message'] = 'You receive a private message'; +$a->strings['Password Settings'] = 'Password Settings'; +$a->strings['Leave password fields blank unless changing'] = 'Leave password fields blank unless changing'; +$a->strings['New Password:'] = 'New Password:'; +$a->strings['Confirm:'] = 'Confirm:'; +$a->strings['Advanced Page Settings'] = 'Advanced Page Settings'; $a->strings['Default Post Permissions'] = 'Default Post Permissions'; $a->strings['Tag removed'] = 'Tag removed'; $a->strings['Remove Item Tag'] = 'Remove Item Tag'; @@ -514,7 +604,6 @@ $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'; @@ -534,6 +623,22 @@ $a->strings['Notifications'] = 'Notifications'; $a->strings['Manage'] = 'Manage'; $a->strings['Settings'] = 'Settings'; $a->strings['Embedding disabled'] = 'Embedding disabled'; +$a->strings['j F, Y'] = 'j F, Y'; +$a->strings['j F'] = 'j F'; +$a->strings['Age:'] = 'Age:'; +$a->strings['♥ Status:'] = '♥ Status:'; +$a->strings['Policial Views:'] = 'Policial Views:'; +$a->strings['Religion:'] = 'Religion:'; +$a->strings['About:'] = 'About:'; +$a->strings['Hobbies/Interests:'] = 'Hobbies/Interests:'; +$a->strings['Contact information and Social Networks:'] = 'Contact information and Social Networks:'; +$a->strings['Musical interests:'] = 'Musical interests:'; +$a->strings['Books, literature:'] = 'Books, literature:'; +$a->strings['Television:'] = 'Television:'; +$a->strings['Film/dance/culture/entertainment:'] = 'Film/dance/culture/entertainment:'; +$a->strings['Love/Romance:'] = 'Love/Romance:'; +$a->strings['Work/employment:'] = 'Work/employment:'; +$a->strings['School/education:'] = 'School/education:'; $a->strings['Male'] = 'Male'; $a->strings['Female'] = 'Female'; $a->strings['Currently Male'] = 'Currently Male'; diff --git a/view/en/contact_edit.tpl b/view/contact_edit.tpl similarity index 79% rename from view/en/contact_edit.tpl rename to view/contact_edit.tpl index 9aca60188c..4c2c6c6f81 100644 --- a/view/en/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -28,7 +28,7 @@
-
-
-
-$lastupdtext$last_update
+
diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl
deleted file mode 100644
index 0b32bdd66b..0000000000
--- a/view/de/contact_edit.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-
-$lastupdtext$last_update
$updpub
$poll_interval
@@ -41,41 +41,41 @@ $blocked
$ignored
-
-
+
Contact Information / Notes
+$lbl_info1
-
$profile_select
-
+
Profile Visibility
-Please choose the profile you would like to display to $name when viewing your profile securely. +
$lbl_vis1
+$lbl_vis2
-
$groups
-
+
Online Reputation
+$lbl_rep1
-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. +$lbl_rep2 $lbl_rep3
$rating
-Please take a moment to elaborate on this selection if you feel it could be helpful to others. +$lbl_rep4
$header
- - - -
-
-
-
-
-
-
-
-
-
-
--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/en/profile_entry_default.tpl b/view/en/profile_entry_default.tpl
deleted file mode 100644
index 6511999184..0000000000
--- a/view/en/profile_entry_default.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/view/en/pwdreset.tpl b/view/en/pwdreset.tpl
deleted file mode 100644
index dd609f0610..0000000000
--- a/view/en/pwdreset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-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/contact_edit.tpl b/view/fr/contact_edit.tpl deleted file mode 100644 index d74ac54f38..0000000000 --- a/view/fr/contact_edit.tpl +++ /dev/null @@ -1,83 +0,0 @@ - -
$header
- - - - - - diff --git a/view/fr/profile_entry_default.tpl b/view/fr/profile_entry_default.tpl deleted file mode 100644 index b7f94b0b07..0000000000 --- a/view/fr/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl
deleted file mode 100644
index e506b20663..0000000000
--- a/view/fr/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-Téléverser une photo de profil
- - - - diff --git a/view/fr/pwdreset.tpl b/view/fr/pwdreset.tpl deleted file mode 100644 index 502d0d4474..0000000000 --- a/view/fr/pwdreset.tpl +++ /dev/null @@ -1,18 +0,0 @@ -Mot de passe réinitialisé
- --Votre mot de passe a été changé, comme demandé. -
--Votre nouveau mot de passe est -
--$newpass -
--Sauvez ou copiez ce nouveau mot de passe - puis connectez-vous. - -
--Votre mot de passe pourra être changé, après connexion, dans la page 'Réglages'. - diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl deleted file mode 100644 index fc9b6d65b1..0000000000 --- a/view/fr/settings.tpl +++ /dev/null @@ -1,175 +0,0 @@ -
Réglages du compte
- - - -$uexport - -$nickname_block - - - - - diff --git a/view/it/profile_entry_default.tpl b/view/it/profile_entry_default.tpl deleted file mode 100644 index 8c9aedae82..0000000000 --- a/view/it/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-
diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl
deleted file mode 100644
index 4d77e87cf1..0000000000
--- a/view/it/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-Carica foto del profilo
- - - - \ No newline at end of file diff --git a/view/it/pwdreset.tpl b/view/it/pwdreset.tpl deleted file mode 100644 index c283033ee2..0000000000 --- a/view/it/pwdreset.tpl +++ /dev/null @@ -1,16 +0,0 @@ -Resetta Password
- --La tua password è stata resettata come richiesto. -
--La tua nuova password è -
--$newpass -
--Salva o copia la tua nuova password, e quindi clicca qui per accedere. -
--La tua password puo' essere cambiata dalla pagina 'Impostazioni0 dopo aver effettuato l'accesso. diff --git a/view/it/settings.tpl b/view/it/settings.tpl deleted file mode 100644 index f361419da4..0000000000 --- a/view/it/settings.tpl +++ /dev/null @@ -1,175 +0,0 @@ -