From e35a5bac55e0e259c7c587adfaf546484b032c92 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 7 Apr 2011 23:10:43 -0700 Subject: [PATCH] the rest of the english html templates except for htconfig --- {view/fr => include}/profile_advanced.php | 106 ++-- mod/contacts.php | 8 + mod/install.php | 10 + mod/lostpass.php | 7 + mod/profile.php | 11 +- mod/profile_photo.php | 6 +- mod/profiles.php | 38 ++ mod/settings.php | 54 +- util/messages.po | 688 ++++++++++++++++++---- util/strings.php | 109 +++- view/{en => }/contact_edit.tpl | 20 +- view/de/contact_edit.tpl | 86 --- view/de/install_db.tpl | 40 -- view/de/profile_advanced.php | 226 ------- view/de/profile_photo.tpl | 18 - view/de/pwdreset.tpl | 16 - view/de/settings.tpl | 177 ------ view/de/settings_nick_set.tpl | 9 - view/de/settings_nick_subdir.tpl | 9 - view/en/install_db.tpl | 40 -- view/en/profile_advanced.php | 225 ------- view/en/profile_edit.tpl | 299 ---------- view/en/profile_entry_default.tpl | 9 - view/en/pwdreset.tpl | 16 - view/fr/contact_edit.tpl | 83 --- view/fr/profile_edit.tpl | 299 ---------- view/fr/profile_entry_default.tpl | 9 - view/fr/profile_photo.tpl | 18 - view/fr/pwdreset.tpl | 18 - view/fr/settings.tpl | 175 ------ view/fr/settings_nick_set.tpl | 9 - view/fr/settings_nick_subdir.tpl | 7 - view/{fr => }/install_db.tpl | 16 +- view/it/contact_edit.tpl | 80 --- view/it/install_db.tpl | 40 -- view/it/profile_advanced.php | 226 ------- view/it/profile_edit.tpl | 299 ---------- view/it/profile_entry_default.tpl | 9 - view/it/profile_photo.tpl | 18 - view/it/pwdreset.tpl | 16 - view/it/settings.tpl | 175 ------ view/it/settings_nick_set.tpl | 9 - view/it/settings_nick_subdir.tpl | 7 - view/{de => }/profile_edit.tpl | 86 +-- view/{de => }/profile_entry_default.tpl | 2 +- view/{en => }/profile_photo.tpl | 8 +- view/pwdreset.tpl | 17 + view/{en => }/settings.tpl | 60 +- view/{en => }/settings_nick_set.tpl | 4 +- view/{en => }/settings_nick_subdir.tpl | 0 view/sv/contact_edit.tpl | 80 --- view/sv/install_db.tpl | 38 -- view/sv/profile_advanced.php | 223 ------- view/sv/profile_edit.tpl | 298 ---------- view/sv/profile_entry_default.tpl | 9 - view/sv/profile_photo.tpl | 18 - view/sv/pwdreset.tpl | 16 - view/sv/settings.tpl | 175 ------ view/sv/settings_nick_set.tpl | 8 - view/sv/settings_nick_subdir.tpl | 6 - view/theme/duepuntozero/style.css | 5 + 61 files changed, 965 insertions(+), 3828 deletions(-) rename {view/fr => include}/profile_advanced.php (60%) rename view/{en => }/contact_edit.tpl (79%) delete mode 100644 view/de/contact_edit.tpl delete mode 100644 view/de/install_db.tpl delete mode 100644 view/de/profile_advanced.php delete mode 100644 view/de/profile_photo.tpl delete mode 100644 view/de/pwdreset.tpl delete mode 100644 view/de/settings.tpl delete mode 100644 view/de/settings_nick_set.tpl delete mode 100644 view/de/settings_nick_subdir.tpl delete mode 100644 view/en/install_db.tpl delete mode 100644 view/en/profile_advanced.php delete mode 100644 view/en/profile_edit.tpl delete mode 100644 view/en/profile_entry_default.tpl delete mode 100644 view/en/pwdreset.tpl delete mode 100644 view/fr/contact_edit.tpl delete mode 100644 view/fr/profile_edit.tpl delete mode 100644 view/fr/profile_entry_default.tpl delete mode 100644 view/fr/profile_photo.tpl delete mode 100644 view/fr/pwdreset.tpl delete mode 100644 view/fr/settings.tpl delete mode 100644 view/fr/settings_nick_set.tpl delete mode 100644 view/fr/settings_nick_subdir.tpl rename view/{fr => }/install_db.tpl (51%) delete mode 100644 view/it/contact_edit.tpl delete mode 100644 view/it/install_db.tpl delete mode 100644 view/it/profile_advanced.php delete mode 100644 view/it/profile_edit.tpl delete mode 100644 view/it/profile_entry_default.tpl delete mode 100644 view/it/profile_photo.tpl delete mode 100644 view/it/pwdreset.tpl delete mode 100644 view/it/settings.tpl delete mode 100644 view/it/settings_nick_set.tpl delete mode 100644 view/it/settings_nick_subdir.tpl rename view/{de => }/profile_edit.tpl (78%) rename view/{de => }/profile_entry_default.tpl (93%) rename view/{en => }/profile_photo.tpl (77%) create mode 100644 view/pwdreset.tpl rename view/{en => }/settings.tpl (62%) rename view/{en => }/settings_nick_set.tpl (51%) rename view/{en => }/settings_nick_subdir.tpl (100%) delete mode 100644 view/sv/contact_edit.tpl delete mode 100644 view/sv/install_db.tpl delete mode 100644 view/sv/profile_advanced.php delete mode 100644 view/sv/profile_edit.tpl delete mode 100644 view/sv/profile_entry_default.tpl delete mode 100644 view/sv/profile_photo.tpl delete mode 100644 view/sv/pwdreset.tpl delete mode 100644 view/sv/settings.tpl delete mode 100644 view/sv/settings_nick_set.tpl delete mode 100644 view/sv/settings_nick_subdir.tpl diff --git a/view/fr/profile_advanced.php b/include/profile_advanced.php similarity index 60% rename from view/fr/profile_advanced.php rename to include/profile_advanced.php index e5e046025..8c4ba7698 100644 --- a/view/fr/profile_advanced.php +++ b/include/profile_advanced.php @@ -1,46 +1,54 @@ Profil - - -EOT; +$o .= '

' . t('Profile') . '

'; if($a->profile['name']) { + $lbl_fullname = t('Full Name:'); + $fullname = $a->profile['name']; + $o .= <<< EOT
-
Nom complet:
-
{$a->profile['name']}
+
$lbl_fullname
+
$fullname
EOT; } if($a->profile['gender']) { + $lbl_gender = t('Gender:'); + $gender = $a->profile['gender']; + $o .= <<< EOT
-
Genre:
-
{$a->profile['gender']}
+
$lbl_gender
+
$gender
EOT; } if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + $lbl_birthday = t('Birthday:'); + $o .= <<< EOT
-
Date de naissance/anniversaire:
+
$lbl_birthday
EOT; // If no year, add an arbitrary one so just we can parse the month and day. +$year_bd_format = t('j F, Y'); +$short_bd_format = t('j F'); + $o .= '
' . ((intval($a->profile['dob'])) - ? 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'))) + ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format)) + : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format))) . "
\r\n
"; $o .= '
'; @@ -48,9 +56,10 @@ $o .= '
'; } if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { + $lbl_age = t('Age:'); $o .= <<< EOT
-
Age:
+
$lbl_age
$age
@@ -58,14 +67,19 @@ EOT; } if($a->profile['marital']) { + $lbl_marital = t('♥ Status:'); + $marital = $a->profile['marital']; + $o .= <<< EOT
-
♥ Statut:
-
{$a->profile['marital']}
+
$lbl_marital
+
$marital
EOT; -if($a->profile['with']) - $o .= "
({$a->profile['with']})
"; +if($a->profile['with']) { + $with = $a->profile['with']; + $o .= "
($with)
"; +} $o .= <<< EOT
@@ -73,20 +87,24 @@ EOT; } if($a->profile['sexual']) { + $lbl_sexual = t('Sexual Preference:'); + $sexual = $a->profile['sexual']; + $o .= <<< EOT
-
Attirances sexuelles:
-
{$a->profile['sexual']}
+
$lbl_sexual
+
$sexual
EOT; } if($a->profile['homepage']) { + $lbl_homepage = t('Homepage:'); $homepage = linkify($a->profile['homepage']); $o .= <<< EOT
-
Site web:
+
$lbl_homepage
$homepage
@@ -94,29 +112,33 @@ EOT; } if($a->profile['politic']) { + $lbl_politic = t('Policial Views:'); + $politic = $a->profile['politic']; $o .= <<< EOT
-
Opinions politiques:
-
{$a->profile['politic']}
+
$lbl_politic
+
$politic
EOT; } if($a->profile['religion']) { + $lbl_religion = t('Religion:'); + $religion = $a->profile['religion']; $o .= <<< EOT
-
Religion:
-
{$a->profile['religion']}
+
$lbl_religion
+
$religion
EOT; } - if($txt = prepare_text($a->profile['about'])) { + $lbl_about = t('About:'); $o .= <<< EOT
-
À propos:
+
$lbl_about

$txt
@@ -125,9 +147,10 @@ EOT; } if($txt = prepare_text($a->profile['interest'])) { + $lbl_interests = t('Hobbies/Interests:'); $o .= <<< EOT
-
Marottes/Centres d'intérêt:
+
$lbl_interests

$txt
@@ -136,9 +159,10 @@ EOT; } if($txt = prepare_text($a->profile['contact'])) { + $lbl_contact = t('Contact information and Social Networks:'); $o .= <<< EOT
-
Coordonées et réseaux sociaux:
+
$lbl_contact

$txt
@@ -147,9 +171,10 @@ EOT; } if($txt = prepare_text($a->profile['music'])) { + $lbl_music = t('Musical interests:'); $o .= <<< EOT
-
Goûts musicaux:
+
$lbl_music

$txt
@@ -158,9 +183,10 @@ EOT; } if($txt = prepare_text($a->profile['book'])) { + $lbl_book = t('Books, literature:'); $o .= <<< EOT
-
Livres, littérature:
+
$lbl_book

$txt
@@ -169,9 +195,10 @@ EOT; } if($txt = prepare_text($a->profile['tv'])) { + $lbl_tv = t('Television:'); $o .= <<< EOT
-
Télévision:
+
$lbl_tv

$txt
@@ -180,9 +207,10 @@ EOT; } if($txt = prepare_text($a->profile['film'])) { + $lbl_film = t('Film/dance/culture/entertainment:'); $o .= <<< EOT
-
Cinéma/Danse/Culture/Divertissement:
+
$lbl_film

$txt
@@ -191,9 +219,10 @@ EOT; } if($txt = prepare_text($a->profile['romance'])) { + $lbl_romance = t('Love/Romance:'); $o .= <<< EOT
-
Amour/Passion:
+
$lbl_romance

$txt
@@ -202,9 +231,10 @@ EOT; } if($txt = prepare_text($a->profile['work'])) { + $lbl_work = t('Work/employment:'); $o .= <<< EOT
-
Travail/Activité professionnelle:
+
$lbl_work

$txt
@@ -213,9 +243,10 @@ EOT; } if($txt = prepare_text($a->profile['education'])) { + $lbl_education = t('School/education:'); $o .= <<< EOT
-
École/études:
+
$lbl_education

$txt
@@ -223,4 +254,5 @@ $o .= <<< EOT EOT; } - +return $o; +} diff --git a/mod/contacts.php b/mod/contacts.php index 4d5311b69..834b1c63d 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -261,6 +261,14 @@ function contacts_content(&$a) { $o .= replace_macros($tpl,array( '$header' => t('Contact Editor'), + '$submit' => t('Submit'), + '$lbl_vis1' => t('Profile Visibility'), + '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $r[0]['name']), + '$lbl_info1' => t('Contact Information / Notes'), + '$lbl_rep1' => t('Online Reputation'), + '$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'), + '$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a reputation to guide them.'), + '$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'), '$visit' => t('Visit $name\'s profile'), '$blockunblock' => t('Block/Unblock contact'), '$ignorecont' => t('Ignore contact'), diff --git a/mod/install.php b/mod/install.php index 5c508e4f2..740df6ca9 100644 --- a/mod/install.php +++ b/mod/install.php @@ -118,6 +118,16 @@ function install_content(&$a) { $tpl = load_view_file('view/install_db.tpl'); $o .= replace_macros($tpl, array( + '$lbl_01' => t('Friendika Social Network'), + '$lbl_02' => t('Installation'), + '$lbl_03' => t('In order to install Friendika we need to know how to contact your database.'), + '$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), + '$lbl_05' => t('The database you specify below must already exist. If it does not, please create it before continuing.'), + '$lbl_06' => t('Database Server Name'), + '$lbl_07' => t('Database Login Name'), + '$lbl_08' => t('Database Login Password'), + '$lbl_09' => t('Database Name'), + '$lbl_10' => t('Please select a default timezone for your website'), '$baseurl' => $a->get_baseurl(), '$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()), '$submit' => t('Submit'), diff --git a/mod/lostpass.php b/mod/lostpass.php index 335a1f512..c46a57e6a 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -71,8 +71,15 @@ function lostpass_content(&$a) { if($r) { $tpl = load_view_file('view/pwdreset.tpl'); $o .= replace_macros($tpl,array( + '$lbl1' => t('Password Reset'), + '$lbl2' => t('Your password has been reset as requested.'), + '$lbl3' => t('Your new password is'), + '$lbl4' => t('Save or copy your new password - and then'), + '$lbl5' => '' . t('click here to login') . '.', + '$lbl6' => t('Your password may be changed from the Settings page after successful login.'), '$newpass' => $new_password, '$baseurl' => $a->get_baseurl() + )); notice("Your password has been reset." . EOL); diff --git a/mod/profile.php b/mod/profile.php index 3d0b79a70..88e23a8a4 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -106,16 +106,9 @@ function profile_content(&$a, $update = 0) { if($tab === 'profile') { - $profile_lang = get_config('system','language'); - if(! $profile_lang) - $profile_lang = 'en'; - if(file_exists("view/$profile_lang/profile_advanced.php")) - require_once("view/$profile_lang/profile_advanced.php"); - else - require_once('view/profile_advanced.php'); - + require_once('include/profile_advanced.php'); + $o .= advanced_profile($a); call_hooks('profile_advanced',$o); - return $o; } diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 48805fbdd..fe4da3baf 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -184,7 +184,11 @@ function profile_photo_content(&$a) { $tpl = load_view_file('view/profile_photo.tpl'); $o .= replace_macros($tpl,array( - '$user' => $a->user['nickname'] + '$user' => $a->user['nickname'], + '$lbl_upfile' => t('Upload File:'), + '$title' => t('Upload Profile Photo'), + '$submit' => t('Upload'), + '$select' => sprintf('%s %s', t('or'), '' . t('select a photo from your photo albums') . '') )); return $o; diff --git a/mod/profiles.php b/mod/profiles.php index 99812ed88..4802f21aa 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -366,6 +366,44 @@ function profiles_content(&$a) { $is_default = (($r[0]['is-default']) ? 1 : 0); $tpl = load_view_file("view/profile_edit.tpl"); $o .= replace_macros($tpl,array( + '$banner' => t('Edit Profile Details'), + '$submit' => t('Submit'), + '$viewprof' => t('View this profile'), + '$cr_prof' => t('Create a new profile using these settings'), + '$cl_prof' => t('Clone this profile'), + '$del_prof' => t('Delete this profile'), + '$lbl_profname' => t('Profile Name:'), + '$lbl_fullname' => t('Your Full Name:'), + '$lbl_title' => t('Title/Description:'), + '$lbl_gender' => t('Your Gender:'), + '$lbl_bd' => t("Birthday \x28y/m/d\x29:"), + '$lbl_address' => t('Street Address:'), + '$lbl_city' => t('Locality/City:'), + '$lbl_zip' => t('Postal/Zip Code:'), + '$lbl_country' => t('Country:'), + '$lbl_region' => t('Region/State:'), + '$lbl_marital' => t('♥ Marital Status:'), + '$lbl_with' => t("Who: \x28if applicable\x29"), + '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'), + '$lbl_sexual' => t('Sexual Preference:'), + '$lbl_homepage' => t('Homepage URL:'), + '$lbl_politic' => t('Political Views:'), + '$lbl_religion' => t('Religious Views:'), + '$lbl_pubkey' => t('Public Keywords:'), + '$lbl_prvkey' => t('Private Keywords:'), + '$lbl_ex2' => t('Example: fishing photography software'), + '$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"), + '$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"), + '$lbl_about' => t('Tell us about yourself...'), + '$lbl_hobbies' => t('Hobbies/Interests'), + '$lbl_social' => t('Contact information and Social Networks'), + '$lbl_music' => t('Musical interests'), + '$lbl_book' => t('Books, literature'), + '$lbl_tv' => t('Television'), + '$lbl_film' => t('Film/dance/culture/entertainment'), + '$lbl_love' => t('Love/romance'), + '$lbl_work' => t('Work/employment'), + '$lbl_school' => t('School/education'), '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$baseurl' => $a->get_baseurl(), '$profile_id' => $r[0]['id'], diff --git a/mod/settings.php b/mod/settings.php index 646ec55ea..5f88d95fb 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -315,18 +315,7 @@ function settings_content(&$a) { if($invisible) notice( t('Profile is not published.') . EOL ); - $nickname_block = load_view_file("view/settings_nick_set.tpl"); - $nickname_subdir = ''; - if(strlen($a->get_path())) { - $subdir_tpl = load_view_file('view/settings_nick_subdir.tpl'); - $nickname_subdir = replace_macros($subdir_tpl, array( - '$baseurl' => $a->get_baseurl(), - '$nickname' => $nickname, - '$hostname' => $a->get_hostname() - )); - } - $theme_selector = ''; + $subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : ''); - $nickname_block = replace_macros($nickname_block,array( + $tpl_addr = load_view_file("view/settings_nick_set.tpl"); + + $prof_addr = replace_macros($tpl_addr,array( + '$desc' => t('Your profile address is'), '$nickname' => $nickname, - '$uid' => local_user(), - '$subdir' => $nickname_subdir, - '$basepath' => $a->get_hostname(), - '$baseurl' => $a->get_baseurl())); + '$subdir' => $subdir, + '$basepath' => $a->get_hostname() + )); $stpl = load_view_file('view/settings.tpl'); @@ -360,6 +352,34 @@ function settings_content(&$a) { $o .= replace_macros($stpl,array( + '$ptitle' => t('Account Settings'), + '$lbl_plug' => t('Plugin Settings'), + '$lbl_basic' => t('Basic Settings'), + '$lbl_fn' => t('Full Name:'), + '$lbl_email' => t('Email Address:'), + '$lbl_tz' => t('Your Timezone:'), + '$lbl_loc1' => t('Default Post Location:'), + '$lbl_loc2' => t('Use Browser Location:'), + '$lbl_theme' => t('Display Theme:'), + '$submit' => t('Submit'), + '$lbl_prv' => t('Security and Privacy Settings'), + '$lbl_maxreq' => t('Maximum Friend Requests/Day:'), + '$lbl_maxrdesc' => t("\x28to prevent spam abuse\x29"), + '$lbl_rempost' => t('Allow friends to post to your profile page:'), + '$lbl_exp1' => t("Automatically expire \x28delete\x29 posts older than"), + '$lbl_exp2' => t('days'), + '$lbl_not1' => t('Notification Settings'), + '$lbl_not2' => t('Send a notification email when:'), + '$lbl_not3' => t('You receive an introduction'), + '$lbl_not4' => t('Your introductions are confirmed'), + '$lbl_not5' => t('Someone writes on your profile wall'), + '$lbl_not6' => t('Someone writes a followup comment'), + '$lbl_not7' => t('You receive a private message'), + '$lbl_pass1' => t('Password Settings'), + '$lbl_pass2' => t('Leave password fields blank unless changing'), + '$lbl_pass3' => t('New Password:'), + '$lbl_pass4' => t('Confirm:'), + '$lbl_advn' => t('Advanced Page Settings'), '$baseurl' => $a->get_baseurl(), '$oidhtml' => $oidhtml, '$uexport' => $uexport, @@ -367,7 +387,7 @@ function settings_content(&$a) { '$username' => $username, '$openid' => $openid, '$email' => $email, - '$nickname_block' => $nickname_block, + '$nickname_block' => $prof_addr, '$timezone' => $timezone, '$zoneselect' => select_timezone($timezone), '$defloc' => $defloc, diff --git a/util/messages.po b/util/messages.po index e1b15df64..15a340c83 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.942\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 17:54-0700\n" +"POT-Creation-Date: 2011-04-07 22:57-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -97,7 +97,7 @@ msgstr "" #: ../../mod/register.php:292 ../../mod/register.php:299 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 #: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155 -#: ../../mod/profile_photo.php:227 ../../mod/profile_photo.php:236 +#: ../../mod/profile_photo.php:231 ../../mod/profile_photo.php:240 #: ../../wip/photos.php:98 ../../wip/photos.php:493 ../../wip/photos.php:785 #: ../../wip/photos.php:800 ../../wip/photos-chris.php:118 #: ../../wip/photos-chris.php:525 ../../wip/photos-chris.php:832 @@ -148,7 +148,7 @@ msgstr "" msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:589 ../../mod/profile_photo.php:232 +#: ../../mod/photos.php:589 ../../mod/profile_photo.php:236 #: ../../mod/wall_upload.php:82 ../../wip/photos.php:537 #: ../../wip/photos-chris.php:585 msgid "Image upload failed." @@ -160,10 +160,12 @@ msgid "No photos selected" msgstr "" #: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066 -#: ../../mod/photos.php:1109 ../../mod/install.php:123 +#: ../../mod/photos.php:1109 ../../mod/install.php:133 +#: ../../mod/contacts.php:264 ../../mod/settings.php:364 #: ../../mod/manage.php:106 ../../mod/network.php:506 ../../mod/group.php:97 -#: ../../mod/group.php:155 ../../mod/profile.php:395 ../../mod/display.php:174 -#: ../../mod/invite.php:64 ../../addon/facebook/facebook.php:151 +#: ../../mod/group.php:155 ../../mod/profile.php:388 ../../mod/display.php:174 +#: ../../mod/profiles.php:370 ../../mod/invite.php:64 +#: ../../addon/facebook/facebook.php:151 #: ../../addon/randplace/randplace.php:179 #: ../../addon/statusnet/statusnet.php:163 #: ../../addon/statusnet/statusnet.php:189 @@ -222,7 +224,7 @@ msgid "Use as profile photo" msgstr "" #: ../../mod/photos.php:962 ../../mod/network.php:443 -#: ../../mod/profile.php:370 ../../mod/display.php:149 +#: ../../mod/profile.php:363 ../../mod/display.php:149 msgid "Private Message" msgstr "" @@ -269,32 +271,32 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" #: ../../mod/photos.php:1084 ../../mod/network.php:487 -#: ../../mod/profile.php:377 ../../mod/display.php:156 +#: ../../mod/profile.php:370 ../../mod/display.php:156 msgid "I like this (toggle)" msgstr "" #: ../../mod/photos.php:1085 ../../mod/network.php:488 -#: ../../mod/profile.php:378 ../../mod/display.php:157 +#: ../../mod/profile.php:371 ../../mod/display.php:157 msgid "I don't like this (toggle)" msgstr "" #: ../../mod/photos.php:1086 ../../mod/network.php:105 -#: ../../mod/network.php:489 ../../mod/profile.php:165 -#: ../../mod/profile.php:379 ../../mod/display.php:158 +#: ../../mod/network.php:489 ../../mod/profile.php:158 +#: ../../mod/profile.php:372 ../../mod/display.php:158 msgid "Share" msgstr "" #: ../../mod/photos.php:1087 ../../mod/editpost.php:70 #: ../../mod/network.php:114 ../../mod/network.php:490 #: ../../mod/message.php:190 ../../mod/message.php:324 -#: ../../mod/profile.php:174 ../../mod/profile.php:380 +#: ../../mod/profile.php:167 ../../mod/profile.php:373 #: ../../mod/display.php:159 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1106 ../../mod/photos.php:1148 #: ../../mod/photos.php:1177 ../../mod/network.php:503 -#: ../../mod/profile.php:392 ../../mod/display.php:171 +#: ../../mod/profile.php:385 ../../mod/display.php:171 #: ../../wip/photos.php:986 ../../wip/photos.php:1025 #: ../../wip/photos.php:1053 ../../wip/photos-chris.php:1033 #: ../../wip/photos-chris.php:1072 ../../wip/photos-chris.php:1100 @@ -302,12 +304,12 @@ msgid "This is you" msgstr "" #: ../../mod/photos.php:1108 ../../mod/network.php:505 -#: ../../mod/profile.php:394 ../../mod/display.php:173 ../../boot.php:360 +#: ../../mod/profile.php:387 ../../mod/display.php:173 ../../boot.php:360 msgid "Comment" msgstr "" #: ../../mod/photos.php:1205 ../../mod/network.php:514 ../../mod/group.php:141 -#: ../../mod/profile.php:440 ../../mod/display.php:240 +#: ../../mod/profile.php:433 ../../mod/display.php:240 msgid "Delete" msgstr "" @@ -335,59 +337,59 @@ msgid "Edit post" msgstr "" #: ../../mod/editpost.php:62 ../../mod/network.php:513 -#: ../../mod/profile.php:418 ../../mod/display.php:224 +#: ../../mod/profile.php:411 ../../mod/display.php:224 msgid "Edit" msgstr "" #: ../../mod/editpost.php:63 ../../mod/network.php:106 #: ../../mod/message.php:188 ../../mod/message.php:322 -#: ../../mod/profile.php:166 +#: ../../mod/profile.php:159 msgid "Upload photo" msgstr "" #: ../../mod/editpost.php:64 ../../mod/network.php:107 #: ../../mod/message.php:189 ../../mod/message.php:323 -#: ../../mod/profile.php:167 +#: ../../mod/profile.php:160 msgid "Insert web link" msgstr "" #: ../../mod/editpost.php:65 ../../mod/network.php:108 -#: ../../mod/profile.php:168 +#: ../../mod/profile.php:161 msgid "Insert YouTube video" msgstr "" #: ../../mod/editpost.php:66 ../../mod/network.php:109 -#: ../../mod/profile.php:169 +#: ../../mod/profile.php:162 msgid "Insert Vorbis [.ogg] video" msgstr "" #: ../../mod/editpost.php:67 ../../mod/network.php:110 -#: ../../mod/profile.php:170 +#: ../../mod/profile.php:163 msgid "Insert Vorbis [.ogg] audio" msgstr "" #: ../../mod/editpost.php:68 ../../mod/network.php:111 -#: ../../mod/profile.php:171 +#: ../../mod/profile.php:164 msgid "Set your location" msgstr "" #: ../../mod/editpost.php:69 ../../mod/network.php:112 -#: ../../mod/profile.php:172 +#: ../../mod/profile.php:165 msgid "Clear browser location" msgstr "" #: ../../mod/editpost.php:71 ../../mod/network.php:115 -#: ../../mod/profile.php:175 +#: ../../mod/profile.php:168 msgid "Permission settings" msgstr "" #: ../../mod/editpost.php:77 ../../mod/network.php:121 -#: ../../mod/profile.php:182 +#: ../../mod/profile.php:175 msgid "CC: email addresses" msgstr "" #: ../../mod/editpost.php:79 ../../mod/network.php:123 -#: ../../mod/profile.php:184 +#: ../../mod/profile.php:177 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -592,7 +594,7 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189 +#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199 msgid "Please see the file \"INSTALL.txt\"." msgstr "" @@ -614,92 +616,137 @@ msgstr "" msgid "Welcome to Friendika." msgstr "" -#: ../../mod/install.php:138 +#: ../../mod/install.php:121 +msgid "Friendika Social Network" +msgstr "" + +#: ../../mod/install.php:122 +msgid "Installation" +msgstr "" + +#: ../../mod/install.php:123 +msgid "" +"In order to install Friendika we need to know how to contact your database." +msgstr "" + +#: ../../mod/install.php:124 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "" + +#: ../../mod/install.php:125 +msgid "" +"The database you specify below must already exist. If it does not, please " +"create it before continuing." +msgstr "" + +#: ../../mod/install.php:126 +msgid "Database Server Name" +msgstr "" + +#: ../../mod/install.php:127 +msgid "Database Login Name" +msgstr "" + +#: ../../mod/install.php:128 +msgid "Database Login Password" +msgstr "" + +#: ../../mod/install.php:129 +msgid "Database Name" +msgstr "" + +#: ../../mod/install.php:130 +msgid "Please select a default timezone for your website" +msgstr "" + +#: ../../mod/install.php:148 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/install.php:139 +#: ../../mod/install.php:149 msgid "" "This is required. Please adjust the configuration file .htconfig.php " "accordingly." msgstr "" -#: ../../mod/install.php:146 +#: ../../mod/install.php:156 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/install.php:147 +#: ../../mod/install.php:157 msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/install.php:169 +#: ../../mod/install.php:179 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../mod/install.php:170 +#: ../../mod/install.php:180 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../mod/install.php:179 +#: ../../mod/install.php:189 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/install.php:181 +#: ../../mod/install.php:191 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/install.php:183 +#: ../../mod/install.php:193 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/install.php:185 +#: ../../mod/install.php:195 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/install.php:187 +#: ../../mod/install.php:197 msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/install.php:198 +#: ../../mod/install.php:208 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/install.php:199 +#: ../../mod/install.php:209 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../mod/install.php:200 +#: ../../mod/install.php:210 msgid "" "Please check with your site documentation or support people to see if this " "situation can be corrected." msgstr "" -#: ../../mod/install.php:201 +#: ../../mod/install.php:211 msgid "" "If not, you may be required to perform a manual installation. Please see the " "file \"INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/install.php:210 +#: ../../mod/install.php:220 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../mod/install.php:225 +#: ../../mod/install.php:235 msgid "Errors encountered creating database tables." msgstr "" @@ -864,15 +911,15 @@ msgstr "" msgid "Contact not found." msgstr "" -#: ../../mod/contacts.php:228 ../../mod/contacts.php:352 +#: ../../mod/contacts.php:228 ../../mod/contacts.php:360 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:232 ../../mod/contacts.php:356 +#: ../../mod/contacts.php:232 ../../mod/contacts.php:364 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:237 ../../mod/contacts.php:360 +#: ../../mod/contacts.php:237 ../../mod/contacts.php:368 msgid "you are a fan of" msgstr "" @@ -900,84 +947,121 @@ msgstr "" msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:264 -msgid "Visit $name's profile" -msgstr "" - #: ../../mod/contacts.php:265 -msgid "Block/Unblock contact" +msgid "Profile Visibility" msgstr "" #: ../../mod/contacts.php:266 -msgid "Ignore contact" +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" #: ../../mod/contacts.php:267 -msgid "Delete contact" +msgid "Contact Information / Notes" +msgstr "" + +#: ../../mod/contacts.php:268 +msgid "Online Reputation" msgstr "" #: ../../mod/contacts.php:269 -msgid "Last updated: " +msgid "" +"Occasionally your friends may wish to inquire about this person's online " +"legitimacy." msgstr "" #: ../../mod/contacts.php:270 -msgid "Update public posts: " +msgid "" +"You may help them choose whether or not to interact with this person by " +"providing a reputation to guide them." +msgstr "" + +#: ../../mod/contacts.php:271 +msgid "" +"Please take a moment to elaborate on this selection if you feel it could be " +"helpful to others." msgstr "" #: ../../mod/contacts.php:272 -msgid "Update now" +msgid "Visit $name's profile" +msgstr "" + +#: ../../mod/contacts.php:273 +msgid "Block/Unblock contact" +msgstr "" + +#: ../../mod/contacts.php:274 +msgid "Ignore contact" msgstr "" #: ../../mod/contacts.php:275 -msgid "Unblock this contact" +msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:275 -msgid "Block this contact" +#: ../../mod/contacts.php:277 +msgid "Last updated: " msgstr "" -#: ../../mod/contacts.php:276 -msgid "Unignore this contact" -msgstr "" - -#: ../../mod/contacts.php:276 -msgid "Ignore this contact" -msgstr "" - -#: ../../mod/contacts.php:279 -msgid "Currently blocked" +#: ../../mod/contacts.php:278 +msgid "Update public posts: " msgstr "" #: ../../mod/contacts.php:280 +msgid "Update now" +msgstr "" + +#: ../../mod/contacts.php:283 +msgid "Unblock this contact" +msgstr "" + +#: ../../mod/contacts.php:283 +msgid "Block this contact" +msgstr "" + +#: ../../mod/contacts.php:284 +msgid "Unignore this contact" +msgstr "" + +#: ../../mod/contacts.php:284 +msgid "Ignore this contact" +msgstr "" + +#: ../../mod/contacts.php:287 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/contacts.php:288 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:311 ../../include/nav.php:112 +#: ../../mod/contacts.php:319 ../../include/nav.php:112 #: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:321 msgid "Show Blocked Connections" msgstr "" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:321 msgid "Hide Blocked Connections" msgstr "" -#: ../../mod/contacts.php:315 ../../mod/directory.php:38 +#: ../../mod/contacts.php:323 ../../mod/directory.php:38 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:316 ../../mod/directory.php:40 +#: ../../mod/contacts.php:324 ../../mod/directory.php:40 msgid "Find" msgstr "" -#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44 +#: ../../mod/contacts.php:384 ../../mod/viewcontacts.php:44 msgid "Visit $username's profile" msgstr "" -#: ../../mod/contacts.php:377 ../../boot.php:2732 +#: ../../mod/contacts.php:385 ../../boot.php:2732 msgid "Edit contact" msgstr "" @@ -996,21 +1080,47 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:100 +#: ../../mod/lostpass.php:74 ../../boot.php:831 +msgid "Password Reset" +msgstr "" + +#: ../../mod/lostpass.php:75 +msgid "Your password has been reset as requested." +msgstr "" + +#: ../../mod/lostpass.php:76 +msgid "Your new password is" +msgstr "" + +#: ../../mod/lostpass.php:77 +msgid "Save or copy your new password - and then" +msgstr "" + +#: ../../mod/lostpass.php:78 +msgid "click here to login" +msgstr "" + +#: ../../mod/lostpass.php:79 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." +msgstr "" + +#: ../../mod/lostpass.php:107 msgid "Forgot your Password?" msgstr "" -#: ../../mod/lostpass.php:101 +#: ../../mod/lostpass.php:108 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -#: ../../mod/lostpass.php:102 +#: ../../mod/lostpass.php:109 msgid "Nickname or Email: " msgstr "" -#: ../../mod/lostpass.php:103 +#: ../../mod/lostpass.php:110 msgid "Reset" msgstr "" @@ -1050,11 +1160,11 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:216 ../../mod/settings.php:356 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:217 +#: ../../mod/settings.php:217 ../../mod/settings.php:355 msgid "Account Settings" msgstr "" @@ -1114,11 +1224,119 @@ msgstr "" msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:359 +#: ../../mod/settings.php:336 ../../mod/profile_photo.php:191 +msgid "or" +msgstr "" + +#: ../../mod/settings.php:341 +msgid "Your profile address is" +msgstr "" + +#: ../../mod/settings.php:351 msgid "Export Personal Data" msgstr "" +#: ../../mod/settings.php:357 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:358 ../../include/profile_advanced.php:10 +msgid "Full Name:" +msgstr "" + +#: ../../mod/settings.php:359 +msgid "Email Address:" +msgstr "" + +#: ../../mod/settings.php:360 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:361 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:362 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:363 +msgid "Display Theme:" +msgstr "" + +#: ../../mod/settings.php:365 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:366 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:367 +msgid "(to prevent spam abuse)" +msgstr "" + +#: ../../mod/settings.php:368 +msgid "Allow friends to post to your profile page:" +msgstr "" + +#: ../../mod/settings.php:369 +msgid "Automatically expire (delete) posts older than" +msgstr "" + +#: ../../mod/settings.php:370 ../../include/datetime.php:154 +msgid "days" +msgstr "" + +#: ../../mod/settings.php:371 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:372 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:373 +msgid "You receive an introduction" +msgstr "" + +#: ../../mod/settings.php:374 +msgid "Your introductions are confirmed" +msgstr "" + +#: ../../mod/settings.php:375 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../mod/settings.php:376 +msgid "Someone writes a followup comment" +msgstr "" + #: ../../mod/settings.php:377 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:378 +msgid "Password Settings" +msgstr "" + +#: ../../mod/settings.php:379 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../mod/settings.php:380 +msgid "New Password:" +msgstr "" + +#: ../../mod/settings.php:381 +msgid "Confirm:" +msgstr "" + +#: ../../mod/settings.php:382 +msgid "Advanced Page Settings" +msgstr "" + +#: ../../mod/settings.php:397 msgid "Default Post Permissions" msgstr "" @@ -1166,31 +1384,31 @@ msgid "Private messages to this group are at risk of public disclosure." msgstr "" #: ../../mod/network.php:77 ../../mod/message.php:172 -#: ../../mod/profile.php:137 +#: ../../mod/profile.php:130 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/network.php:78 ../../mod/profile.php:138 +#: ../../mod/network.php:78 ../../mod/profile.php:131 msgid "Please enter a YouTube link:" msgstr "" -#: ../../mod/network.php:79 ../../mod/profile.php:139 +#: ../../mod/network.php:79 ../../mod/profile.php:132 msgid "Please enter a video(.ogg) link/URL:" msgstr "" -#: ../../mod/network.php:80 ../../mod/profile.php:140 +#: ../../mod/network.php:80 ../../mod/profile.php:133 msgid "Please enter an audio(.ogg) link/URL:" msgstr "" -#: ../../mod/network.php:81 ../../mod/profile.php:141 +#: ../../mod/network.php:81 ../../mod/profile.php:134 msgid "Where are you right now?" msgstr "" -#: ../../mod/network.php:82 ../../mod/profile.php:142 +#: ../../mod/network.php:82 ../../mod/profile.php:135 msgid "Enter a title for this item" msgstr "" -#: ../../mod/network.php:113 ../../mod/profile.php:173 +#: ../../mod/network.php:113 ../../mod/profile.php:166 msgid "Set title" msgstr "" @@ -1207,7 +1425,7 @@ msgid "Group: " msgstr "" #: ../../mod/network.php:330 ../../mod/network.php:563 -#: ../../mod/profile.php:462 ../../mod/display.php:264 +#: ../../mod/profile.php:455 ../../mod/display.php:264 #: ../../mod/search.php:124 msgid "View $name's profile" msgstr "" @@ -1220,7 +1438,7 @@ msgstr "" msgid "See more posts like this" msgstr "" -#: ../../mod/network.php:428 ../../mod/profile.php:359 +#: ../../mod/network.php:428 ../../mod/profile.php:352 #, php-format msgid "See all %d comments" msgstr "" @@ -1242,7 +1460,7 @@ msgid "via Wall-To-Wall:" msgstr "" #: ../../mod/network.php:609 ../../mod/register.php:442 -#: ../../mod/profile.php:496 ../../mod/display.php:320 +#: ../../mod/profile.php:489 ../../mod/display.php:320 msgid "" "Shared content is covered by the Creative Commons Attribution 3.0 license." @@ -1556,7 +1774,7 @@ msgid "Image uploaded but image cropping failed." msgstr "" #: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:239 +#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:243 #, php-format msgid "Image size reduction [%s] failed." msgstr "" @@ -1570,19 +1788,35 @@ msgstr "" msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/profile_photo.php:200 +#: ../../mod/profile_photo.php:188 +msgid "Upload File:" +msgstr "" + +#: ../../mod/profile_photo.php:189 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../mod/profile_photo.php:190 +msgid "Upload" +msgstr "" + +#: ../../mod/profile_photo.php:191 +msgid "select a photo from your photo albums" +msgstr "" + +#: ../../mod/profile_photo.php:204 msgid "Crop Image" msgstr "" -#: ../../mod/profile_photo.php:201 +#: ../../mod/profile_photo.php:205 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/profile_photo.php:202 +#: ../../mod/profile_photo.php:206 msgid "Done Editing" msgstr "" -#: ../../mod/profile_photo.php:230 +#: ../../mod/profile_photo.php:234 msgid "Image uploaded successfully." msgstr "" @@ -1692,7 +1926,7 @@ msgstr "" msgid "Status" msgstr "" -#: ../../mod/profile.php:103 +#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7 msgid "Profile" msgstr "" @@ -1789,29 +2023,177 @@ msgstr "" msgid "Hide my contact/friend list from viewers of this profile?" msgstr "" +#: ../../mod/profiles.php:369 +msgid "Edit Profile Details" +msgstr "" + +#: ../../mod/profiles.php:371 +msgid "View this profile" +msgstr "" + +#: ../../mod/profiles.php:372 +msgid "Create a new profile using these settings" +msgstr "" + #: ../../mod/profiles.php:373 +msgid "Clone this profile" +msgstr "" + +#: ../../mod/profiles.php:374 +msgid "Delete this profile" +msgstr "" + +#: ../../mod/profiles.php:375 +msgid "Profile Name:" +msgstr "" + +#: ../../mod/profiles.php:376 +msgid "Your Full Name:" +msgstr "" + +#: ../../mod/profiles.php:377 +msgid "Title/Description:" +msgstr "" + +#: ../../mod/profiles.php:378 +msgid "Your Gender:" +msgstr "" + +#: ../../mod/profiles.php:379 +msgid "Birthday (y/m/d):" +msgstr "" + +#: ../../mod/profiles.php:380 +msgid "Street Address:" +msgstr "" + +#: ../../mod/profiles.php:381 +msgid "Locality/City:" +msgstr "" + +#: ../../mod/profiles.php:382 +msgid "Postal/Zip Code:" +msgstr "" + +#: ../../mod/profiles.php:383 +msgid "Country:" +msgstr "" + +#: ../../mod/profiles.php:384 +msgid "Region/State:" +msgstr "" + +#: ../../mod/profiles.php:385 +msgid "♥ Marital Status:" +msgstr "" + +#: ../../mod/profiles.php:386 +msgid "Who: (if applicable)" +msgstr "" + +#: ../../mod/profiles.php:387 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90 +msgid "Sexual Preference:" +msgstr "" + +#: ../../mod/profiles.php:389 +msgid "Homepage URL:" +msgstr "" + +#: ../../mod/profiles.php:390 +msgid "Political Views:" +msgstr "" + +#: ../../mod/profiles.php:391 +msgid "Religious Views:" +msgstr "" + +#: ../../mod/profiles.php:392 +msgid "Public Keywords:" +msgstr "" + +#: ../../mod/profiles.php:393 +msgid "Private Keywords:" +msgstr "" + +#: ../../mod/profiles.php:394 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../mod/profiles.php:395 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: ../../mod/profiles.php:396 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: ../../mod/profiles.php:397 +msgid "Tell us about yourself..." +msgstr "" + +#: ../../mod/profiles.php:398 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../mod/profiles.php:399 +msgid "Contact information and Social Networks" +msgstr "" + +#: ../../mod/profiles.php:400 +msgid "Musical interests" +msgstr "" + +#: ../../mod/profiles.php:401 +msgid "Books, literature" +msgstr "" + +#: ../../mod/profiles.php:402 +msgid "Television" +msgstr "" + +#: ../../mod/profiles.php:403 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: ../../mod/profiles.php:404 +msgid "Love/romance" +msgstr "" + +#: ../../mod/profiles.php:405 +msgid "Work/employment" +msgstr "" + +#: ../../mod/profiles.php:406 +msgid "School/education" +msgstr "" + +#: ../../mod/profiles.php:411 msgid "" "This is your public profile.
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 9ee31768d..14e0c64ee 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 9aca60188..4c2c6c6f8 100644 --- a/view/en/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -28,7 +28,7 @@
-
$lastupdtext$last_update +
$lastupdtext$last_update
$updpub
$poll_interval @@ -41,41 +41,41 @@ $blocked $ignored
-

Contact Information / Notes

+

$lbl_info1

- +
-

Profile Visibility

-

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

$lbl_vis1

+

$lbl_vis2

$profile_select
- +
-

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

$groups - +
diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl deleted file mode 100644 index 0b32bdd66..000000000 --- a/view/de/contact_edit.tpl +++ /dev/null @@ -1,86 +0,0 @@ - -

$header

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

Kontaktinformation / Notizen

- -
-
- - - -
-

Profil Sichtbarkeit

-

Bitte wähle das Profil, das du $name gezeigt werden soll, wenn er sich dein -Profil in Friendika betrachtet. -

-
-$profile_select -
- - - - -
-

Online Reputation

-

-Gelegentlich werden sich deine Freunde nach der online Legitimität dieser -Person erkundigen. Du kannst ihnen helfen bei der Entscheidung ob sie mit -dieser Person interagieren wollen indem du den "Ruf" der Person bewertest. -

-
-$rating -
-
-

-Bitte nimm dir einen Moment um deine Auswahl zu kommentieren wenn du meinst das -könnte anderen weiter helfen. -

- -
-
-$groups - - - -
diff --git a/view/de/install_db.tpl b/view/de/install_db.tpl deleted file mode 100644 index 804ce17f3..000000000 --- a/view/de/install_db.tpl +++ /dev/null @@ -1,40 +0,0 @@ - -

Friendika Social Network

-

Installation

- -

-Um Friendika installieren zu können müssen wir wissen wie wir die Datenbank erreichen könne. Bitte kontaktire deinen Hosting Anbieter oder Seitenadministrator wenn du Fragen zu diesen Einstellungen hast. Die Datenbank die du weiter unten angibst muss bereits existieren. Sollte dies nicht der Fall sein erzeuge sie bitte bevor du mit der Installation fortfährst. -

- -
- - - - - -
- - - -
- - - -
- - - -
- -
-Bitte wähle die Standard-Zeitzone deiner Webseite -
- -$tzselect - -
- - -
-
- diff --git a/view/de/profile_advanced.php b/view/de/profile_advanced.php deleted file mode 100644 index ec6eb6e3a..000000000 --- a/view/de/profile_advanced.php +++ /dev/null @@ -1,226 +0,0 @@ -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','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) - : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','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 = prepare_text($a->profile['about'])) { -$o .= <<< EOT -
-
About:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['interest'])) { -$o .= <<< EOT -
-
Hobbies/Interests:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['contact'])) { -$o .= <<< EOT -
-
Contact information and Social Networks:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['music'])) { -$o .= <<< EOT -
-
Musical interests:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['book'])) { -$o .= <<< EOT -
-
Books, literature:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['tv'])) { -$o .= <<< EOT -
-
Television:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['film'])) { -$o .= <<< EOT -
-
Film/dance/culture/entertainment:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['romance'])) { -$o .= <<< EOT -
-
Love/romance:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['work'])) { -$o .= <<< EOT -
-
Work/employment:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['education'])) { -$o .= <<< EOT -
-
School/education:
-
-
$txt
-
-
-EOT; -} - - diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl deleted file mode 100644 index 10d7d7b97..000000000 --- a/view/de/profile_photo.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

Profilbild Hochladen

- -
- -
- - -
- -
- -
- -
- - diff --git a/view/de/pwdreset.tpl b/view/de/pwdreset.tpl deleted file mode 100644 index 30aca0748..000000000 --- a/view/de/pwdreset.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

Zurücksetzen des Passworts

- -

-Dein Passwort wurde wie gewünscht zurück gesetzt. -

-

-Dein neues Passwort lautet: -

-

-$newpass -

-

-Sichere oder kopiere dein neues Passwort und melde dich dann hier an. -

-

-Nachdem du dich angemeldet hast kannst du dein Passwort auf der "Einstellungen" Seite ändern. \ No newline at end of file diff --git a/view/de/settings.tpl b/view/de/settings.tpl deleted file mode 100644 index 1924fc8e1..000000000 --- a/view/de/settings.tpl +++ /dev/null @@ -1,177 +0,0 @@ -

Account Einstellungen

- - - -$uexport - -$nickname_block - - -
- - -

Grundeinstellungen

- -
- - -
-
- -
- - -
-
- - - -
- -$zoneselect -
-
- -
- - -
-
- -
- - -
-
- - - - -
- -$theme -
-
- -
- -
- - -

Sicherheits und Privatsphären Einstellungen

- - - - -
- - -
(um SPAM zu verhindern)
-
-
- - - - -$profile_in_dir - -$profile_in_net_dir - - - -
- -
- - -
-
- -
- - -
-
- - - -
Automatically expire (delete) posts older than days
-
- - -
- -
- - - -

Benachrichtigungs Einstellungen

- - -
-
Benachrichtigungsemail senden wenn:
- - -
- - -
- - -
- - -
- - -
-
-
- -
- -
- - -

Passwort Einstellungen

- - -
-

-Lass die Passwortfelder frei außer du willst das Passwort ändern. -

- - -
-
- -
- - -
-
- -
- $oidhtml -
-
- - -
- -
- - -

Erweiterte Seiteneinstellungen

- -$pagetype - -
- -
- - diff --git a/view/de/settings_nick_set.tpl b/view/de/settings_nick_set.tpl deleted file mode 100644 index 9336951d4..000000000 --- a/view/de/settings_nick_set.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-

-Deine Profiladresse lautet '$nickname@$basepath' -

-$subdir - -
-
diff --git a/view/de/settings_nick_subdir.tpl b/view/de/settings_nick_subdir.tpl deleted file mode 100644 index fa189a769..000000000 --- a/view/de/settings_nick_subdir.tpl +++ /dev/null @@ -1,9 +0,0 @@ -

-Es scheint so als ob deine Friendika Installation in einem Unterverzeichnis von $hostname -liegt, es könnte deshalb unzuverlässig arbeiten. -

-

-Solltest du irgendwelche Probleme haben versuche bitte folgende Profil Adresse -'$baseurl/profile/$nickname' eventuell funktioniert es damit -besser. -

diff --git a/view/en/install_db.tpl b/view/en/install_db.tpl deleted file mode 100644 index c413689c2..000000000 --- a/view/en/install_db.tpl +++ /dev/null @@ -1,40 +0,0 @@ - -

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/en/profile_advanced.php b/view/en/profile_advanced.php deleted file mode 100644 index 6d2ecba4d..000000000 --- a/view/en/profile_advanced.php +++ /dev/null @@ -1,225 +0,0 @@ -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','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) - : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','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 = prepare_text($a->profile['about'])) { -$o .= <<< EOT -
-
About:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['interest'])) { -$o .= <<< EOT -
-
Hobbies/Interests:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['contact'])) { -$o .= <<< EOT -
-
Contact information and Social Networks:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['music'])) { -$o .= <<< EOT -
-
Musical interests:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['book'])) { -$o .= <<< EOT -
-
Books, literature:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['tv'])) { -$o .= <<< EOT -
-
Television:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['film'])) { -$o .= <<< EOT -
-
Film/dance/culture/entertainment:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['romance'])) { -$o .= <<< EOT -
-
Love/romance:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['work'])) { -$o .= <<< EOT -
-
Work/employment:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['education'])) { -$o .= <<< EOT -
-
School/education:
-
-
$txt
-
-
-EOT; -} - - diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl deleted file mode 100644 index 6c7d74daf..000000000 --- a/view/en/profile_edit.tpl +++ /dev/null @@ -1,299 +0,0 @@ -

Edit Profile Details

- - - - - -$default - -
-
- -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
(Used for suggesting potential friends, can be seen by others)
-
- -
- - -
(Used for searching 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/en/profile_entry_default.tpl b/view/en/profile_entry_default.tpl deleted file mode 100644 index 651199918..000000000 --- a/view/en/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-Profile Image -
-
- -
-
diff --git a/view/en/pwdreset.tpl b/view/en/pwdreset.tpl deleted file mode 100644 index dd609f061..000000000 --- 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 d74ac54f3..000000000 --- a/view/fr/contact_edit.tpl +++ /dev/null @@ -1,83 +0,0 @@ - -

$header

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

Informations / Notes du contact

- -
-
- - - -
-

Visibilité du profil

-

Merci de choisir le profil que vous souhaitez afficher à $name lorsqu'il consulte votre page de manière sécurisée. -

-
-$profile_select -
- - - - -
-

Réputation

-

-De temps à autre, vos amis peuvent vouloir en savoir plus sur la légitimité de cette personne "en ligne". Vous pouvez les aider à décider s'ils veulent ou non interagir avec cette personne en indiquant une "réputation". -

-
-$rating -
-
-

-Merci de prendre un moment pour développer si vous pensez que cela peut être utile à d'autres. -

- -
-
-$groups - - - -
diff --git a/view/fr/profile_edit.tpl b/view/fr/profile_edit.tpl deleted file mode 100644 index c76bc592c..000000000 --- a/view/fr/profile_edit.tpl +++ /dev/null @@ -1,299 +0,0 @@ -

Éditer les détails du profil

- - - - - -$default - -
-
- -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
(Utilisés pour les amis potentiels, peuvent être vus)
-
- -
- - -
(Utilisés lors des recherches, ne sont jamais montrés à personne)
-
- - -
- -
-
- -
-

-Parlez nous de vous... -

- - - -
-
-
- - -
-

-Marottes/Centre d'intérêts -

- - - -
-
-
- - -
-

-Coordonnées et réseau sociaux -

- - - -
-
- - - -
- -
-
- - -
-

-Goûts musicaux -

- - - -
-
- - -
-

-Livres, littérature -

- - - -
-
- - - - -
-

-Télévision -

- - - -
-
- - - - -
-

-Cinéma/Danse/Culture/Divertissement -

- - - -
-
- - - -
- -
-
- - -
-

-Amour/Passion -

- - - -
-
- - - - -
-

-Travail/activité professionnelle -

- - - -
-
- - - - -
-

-École/études -

- - - -
-
- - - - -
- -
-
- - - - - diff --git a/view/fr/profile_entry_default.tpl b/view/fr/profile_entry_default.tpl deleted file mode 100644 index b7f94b0b0..000000000 --- a/view/fr/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-Image du profil -
-
- -
-
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl deleted file mode 100644 index e506b2066..000000000 --- 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 502d0d447..000000000 --- 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 fc9b6d65b..000000000 --- a/view/fr/settings.tpl +++ /dev/null @@ -1,175 +0,0 @@ -

Réglages du compte

- - - -$uexport - -$nickname_block - - -
- - -

Réglages basiques

- -
- - -
-
- -
- - -
-
- - - -
- -$zoneselect -
-
- -
- - -
-
- -
- - -
-
- - - - -
- -$theme -
-
- -
- -
- - -

Sécurité et vie privée

- - - - -
- - -
(pour limiter le spam)
-
-
- - - - -$profile_in_dir - -$profile_in_net_dir - - - -
- -
- - -
-
- -
- - -
-
- - -
Faire automatiquement expirer (supprimer) les publications de plus de jours
-
- -
- -
- - - -

Notifications

- - -
-
Envoyer un courriel d'alerte quand:
- - -
- - -
- - -
- - -
- - -
-
-
- -
- -
- - -

Mot de passe

- - -
-

-Laissez le champ vide, sauf si vous souhaitez le changer -

- - -
-
- -
- - -
-
- -
- $oidhtml -
-
- - -
- -
- - -

Réglages avancés

- -$pagetype - -
- -
- - diff --git a/view/fr/settings_nick_set.tpl b/view/fr/settings_nick_set.tpl deleted file mode 100644 index 761b089f1..000000000 --- a/view/fr/settings_nick_set.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-

-L'adresse de votre profil est '$nickname@$basepath' -

-$subdir - -
-
diff --git a/view/fr/settings_nick_subdir.tpl b/view/fr/settings_nick_subdir.tpl deleted file mode 100644 index 2a367f8da..000000000 --- a/view/fr/settings_nick_subdir.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

-Il semble que votre site soit situé dans un sous-répertoire du
-site $hostname, ce réglage pourrait donc ne pas marcher comme prévu.
-

-

Si vous avez le moindre problème, essayez d'utiliser l'adresse
-de profil suivante : '$baseurl/profile/$nickname'. -

diff --git a/view/fr/install_db.tpl b/view/install_db.tpl similarity index 51% rename from view/fr/install_db.tpl rename to view/install_db.tpl index b6aea3e49..1c59dbdb9 100644 --- a/view/fr/install_db.tpl +++ b/view/install_db.tpl @@ -1,33 +1,33 @@ -

Réseau Social Friendika

-

Installation

+

$lbl_01

+

$lbl_02

-Pour pouvoir installer Friendika, nous avons besoin de contacter votre base de données. Merci de contacter votre hébergeur et/ou administrateur si vous avez des questions à ce sujet. La base que vous spécifierez ci-dessous doit exister. Si ce n'est pas le cas, merci de la créer avant toute chose. +$lbl_03 $lbl_04 $lbl_05

- +
- +
- +
- +
-Merci de choisir un fuseau horaire par défaut +$lbl_10
$tzselect diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl deleted file mode 100644 index ac0f13a54..000000000 --- a/view/it/contact_edit.tpl +++ /dev/null @@ -1,80 +0,0 @@ - -

$header

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

Informazioni di contatto / Note

- -
-
- - - - -
-

Visibiltà Profilo

-

Scegli il profilo che vuoi mostrare a $name quando guarda il tuo profilo in modo sicuro.

-
-$profile_select -
- - - - -
-

Reputazione Online

-

Puo' capitare che i tuoi amici vogliano sapere la legittimità online dei questa persona. Puoi aiutarli a scegliere se interagire o no con questa persona fornendo una 'reputazione' per guidarli.

-
-$rating -
-
-

-Prenditi un momento per pensare su questa selezione se senti che puo' essere utile ad altri. -

- -
-
-$groups - - - -
diff --git a/view/it/install_db.tpl b/view/it/install_db.tpl deleted file mode 100644 index 69a467e9d..000000000 --- a/view/it/install_db.tpl +++ /dev/null @@ -1,40 +0,0 @@ - -

Friendika Social Network

-

Installazione

- -

-Per poter installare Friendika dobbiamo conoscrere come collegarci al tuo database. Contatta il tuo hosting provider o l'amministratore del sito se hai domande su questi settaggi. Il database specificato qui di seguito deve essere già presente. Se non esiste, crealo prima di continuare. -

- -
- - - - - -
- - - -
- - - -
- - - -
- -
-Seleziona il fuso orario del tuo sito web -
- -$tzselect - -
- - -
-
- diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php deleted file mode 100644 index fe065d46f..000000000 --- a/view/it/profile_advanced.php +++ /dev/null @@ -1,226 +0,0 @@ -Profilo - - -EOT; - -if($a->profile['name']) { -$o .= <<< EOT -
-
Nome Completo:
-
{$a->profile['name']}
-
-
-EOT; -} - -if($a->profile['gender']) { -$o .= <<< EOT -
-
Genere:
-
{$a->profile['gender']}
-
-
-EOT; -} - -if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { -$o .= <<< EOT -
-
Compleanno:
-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','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) - : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) - . "
\r\n
"; - -$o .= '
'; - -} - -if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { -$o .= <<< EOT -
-
Età:
-
$age
-
-
-EOT; -} - -if($a->profile['marital']) { -$o .= <<< EOT -
-
♥ Stato:
-
{$a->profile['marital']}
-EOT; - -if($a->profile['with']) - $o .= "
({$a->profile['with']})
"; -$o .= <<< EOT -
-
-EOT; -} - -if($a->profile['sexual']) { -$o .= <<< EOT -
-
Preferenze sessuali:
-
{$a->profile['sexual']}
-
-
-EOT; -} - -if($a->profile['homepage']) { - $homepage = linkify($a->profile['homepage']); -$o .= <<< EOT -
-
Homepage:
-
$homepage
-
-
-EOT; -} - -if($a->profile['politic']) { -$o .= <<< EOT -
-
Orientamento politico:
-
{$a->profile['politic']}
-
-
-EOT; -} - -if($a->profile['religion']) { -$o .= <<< EOT -
-
Religione:
-
{$a->profile['religion']}
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['about'])) { -$o .= <<< EOT -
-
Informazioni varie:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['interest'])) { -$o .= <<< EOT -
-
Hobbie/Interessi:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['contact'])) { -$o .= <<< EOT -
-
Informazioni su contatti e Social Networks:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['music'])) { -$o .= <<< EOT -
-
Interessi musicali:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['book'])) { -$o .= <<< EOT -
-
Libri, letteratura:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['tv'])) { -$o .= <<< EOT -
-
Televisione:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['film'])) { -$o .= <<< EOT -
-
Film/danza/cultura/intrattenimento:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['romance'])) { -$o .= <<< EOT -
-
Amore/romanticismo:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['work'])) { -$o .= <<< EOT -
-
Lavoro/impiego:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['education'])) { -$o .= <<< EOT -
-
Scuola/educazione:
-
-
$txt
-
-
-EOT; -} - - diff --git a/view/it/profile_edit.tpl b/view/it/profile_edit.tpl deleted file mode 100644 index 9f2a13790..000000000 --- a/view/it/profile_edit.tpl +++ /dev/null @@ -1,299 +0,0 @@ -

Modifica i dettagli del profilo

- - - - - -$default - -
-
- -
- -
*
-
-
- -
- - -
-
- -
- - -
(es. titolo, posizione, altro)
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
(Used for suggesting potential friends, can be seen by others)
-
- -
- - -
(Usati per la ricerca dei profili, mai mostrati agli altri)
-
- - -
- -
-
- -
-

-Raccontaci di te.... -

- - - -
-
-
- - -
-

-Hobbie/Interessi -

- - - -
-
-
- - -
-

-Informazioni su contatti e Social network -

- - - -
-
- - - -
- -
-
- - -
-

-Interessi musicali -

- - - -
-
- - -
-

-Libri, letteratura -

- - - -
-
- - - - -
-

-Televisione -

- - - -
-
- - - - -
-

-Film/danza/cultura/intrattenimento -

- - - -
-
- - - -
- -
-
- - -
-

-Amore/romanticismo -

- - - -
-
- - - - -
-

-Lavoro/impiego -

- - - -
-
- - - - -
-

-Scuola/educazione -

- - - -
-
- - - - -
- -
-
- - - - - diff --git a/view/it/profile_entry_default.tpl b/view/it/profile_entry_default.tpl deleted file mode 100644 index 8c9aedae8..000000000 --- a/view/it/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-Immagine Profilo -
-
- -
-
diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl deleted file mode 100644 index 4d77e87cf..000000000 --- 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 c283033ee..000000000 --- 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 f361419da..000000000 --- a/view/it/settings.tpl +++ /dev/null @@ -1,175 +0,0 @@ -

Impostazioni account

- - - -$uexport - -$nickname_block - - -
- - -

Impostazioni base

- -
- - -
-
- -
- - -
-
- - - -
- -$zoneselect -
-
- -
- - -
-
- -
- - -
-
- - - - -
- -$theme -
-
- -
- -
- - -

Impostazioni di Sicurezza e Privacy

- - - - -
- - -
(per prevenire lo spam)
-
-
- - - - -$profile_in_dir - -$profile_in_net_dir - - - -
- -
- - -
-
- -
- - -
-
- - -
Cancella automaticamente i messaggi più vecchi di giorni
-
- -
- -
- - - -

Impostazione Notifiche

- - -
-
Invia una mail di notifica quando:
- - -
- - -
- - -
- - -
- - -
-
-
- -
- -
- - -

Impostazioni Password

- - -
-

-Lascia questi campi in bianco per non effettuare variazioni alla password -

- - -
-
- -
- - -
-
- -
- $oidhtml -
-
- - -
- -
- - -

Impostazioni Avanzate Account

- -$pagetype - -
- -
- - diff --git a/view/it/settings_nick_set.tpl b/view/it/settings_nick_set.tpl deleted file mode 100644 index c57653703..000000000 --- a/view/it/settings_nick_set.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-

-L'indirizzo del tuo profilo è '$nickname@$basepath' -

-$subdir - -
-
diff --git a/view/it/settings_nick_subdir.tpl b/view/it/settings_nick_subdir.tpl deleted file mode 100644 index fc6138c6c..000000000 --- a/view/it/settings_nick_subdir.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

-Sembra che il tuo sito web sia in una sottocartella del sito
-$hostname. Qualche impostazione potrebbe non funzionare correttamente.
-

-

-Se hai problemi, potresti avere migliori risultati usando l'inidirizzo
'$baseurl/profile/$nickname'. -

diff --git a/view/de/profile_edit.tpl b/view/profile_edit.tpl similarity index 78% rename from view/de/profile_edit.tpl rename to view/profile_edit.tpl index 0b0619420..6e27dfca5 100644 --- a/view/de/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -1,11 +1,11 @@ -

Proil Details Bearbeiten

+

$banner

@@ -18,32 +18,32 @@ $default
- +
*
- +
- +
- + $gender
- +
$dob $age
@@ -53,32 +53,32 @@ $dob $age $hide_friends
- +
- +
- +
- +
- + @@ -96,20 +96,20 @@ $hide_friends
- +
- + $marital
- - + +
- + $sexual
@@ -117,44 +117,44 @@ $sexual
- +
- +
- +
- - -
(Used for suggesting potential friends, can be seen by others)
+ + +
$lbl_pubdsc
- - -
(Used for searching profiles, never shown to others)
+ + +
$lbl_prvdsc
- +

-Tell us about yourself... +$lbl_about

@@ -166,7 +166,7 @@ Tell us about yourself...

-Hobbies/Interests +$lbl_hobbies

@@ -178,7 +178,7 @@ Hobbies/Interests

-Contact information and Social Networks +$lbl_social

@@ -189,14 +189,14 @@ Contact information and Social Networks
- +

-Musical interests +$lbl_music

@@ -207,7 +207,7 @@ Musical interests

-Books, literature +$lbl_book

@@ -220,7 +220,7 @@ Books, literature

-Television +$lbl_tv

@@ -233,7 +233,7 @@ Television

-Film/dance/culture/entertainment +$lbl_film

@@ -244,14 +244,14 @@ Film/dance/culture/entertainment
- +

-Love/romance +$lbl_love

@@ -264,7 +264,7 @@ Love/romance

-Work/employment +$lbl_work

@@ -277,7 +277,7 @@ Work/employment

-School/education +$lbl_school

@@ -289,7 +289,7 @@ School/education
- +
diff --git a/view/de/profile_entry_default.tpl b/view/profile_entry_default.tpl similarity index 93% rename from view/de/profile_entry_default.tpl rename to view/profile_entry_default.tpl index dff6b53f7..98f20dbe7 100644 --- a/view/de/profile_entry_default.tpl +++ b/view/profile_entry_default.tpl @@ -1,7 +1,7 @@
-Profilbild +$alt
diff --git a/view/en/profile_photo.tpl b/view/profile_photo.tpl similarity index 77% rename from view/en/profile_photo.tpl rename to view/profile_photo.tpl index 30e51210a..f258b5b86 100644 --- a/view/en/profile_photo.tpl +++ b/view/profile_photo.tpl @@ -1,18 +1,18 @@ -

Upload Profile Photo

+

$title

- +
- +
\ No newline at end of file diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl new file mode 100644 index 000000000..497b93396 --- /dev/null +++ b/view/pwdreset.tpl @@ -0,0 +1,17 @@ +

$lbl1

+ +

+$lbl2 +

+

+$lbl3 +

+

+$newpass +

+

+$lbl4 $lbl5 +

+

+$lbl6 +

diff --git a/view/en/settings.tpl b/view/settings.tpl similarity index 62% rename from view/en/settings.tpl rename to view/settings.tpl index 9822291c1..162299f5d 100644 --- a/view/en/settings.tpl +++ b/view/settings.tpl @@ -1,6 +1,6 @@ -

Account Settings

+

$ptitle

- + $uexport @@ -10,16 +10,16 @@ $nickname_block
-

Basic Settings

+

$lbl_basic

- +
- +
@@ -27,19 +27,19 @@ $nickname_block
- + $zoneselect
- +
- +
@@ -48,25 +48,25 @@ $zoneselect
- + $theme
- +
-

Security and Privacy Settings

+

$lbl_prv

- + -
(to prevent spam abuse)
+
$lbl_maxrdesc
@@ -91,14 +91,14 @@ $profile_in_net_dir
- +
-
Automatically expire (delete) posts older than days
+
$lbl_exp1 $lbl_exp2
@@ -108,48 +108,48 @@ $profile_in_net_dir -

Notification Settings

+

$lbl_not1

-
Send a notification email when:
- +
$lbl_not2
+
- +
- +
- +
- +
- +
-

Password Settings

+

$lbl_pass1

-Leave password fields blank unless changing +$lbl_pass2

- +
- +
@@ -161,16 +161,16 @@ Leave password fields blank unless changing
- +
-

Advanced Page Settings

+

$lbl_advn

$pagetype
- +
diff --git a/view/en/settings_nick_set.tpl b/view/settings_nick_set.tpl similarity index 51% rename from view/en/settings_nick_set.tpl rename to view/settings_nick_set.tpl index a36b3b9a2..4378b4884 100644 --- a/view/en/settings_nick_set.tpl +++ b/view/settings_nick_set.tpl @@ -1,9 +1,7 @@

-Your profile address is '$nickname@$basepath' +$desc '$nickname@$basepath'$subdir

-$subdir -
diff --git a/view/en/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl similarity index 100% rename from view/en/settings_nick_subdir.tpl rename to view/settings_nick_subdir.tpl diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl deleted file mode 100644 index f7a0d9af1..000000000 --- a/view/sv/contact_edit.tpl +++ /dev/null @@ -1,80 +0,0 @@ -

$header

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

Kontaktuppgifter / Anteckningar

- -
-
- - - -
-

Profilvisning

-

Välj vilken profil som ska visas för $name när han eller hon tittar på din profil i säkert läge. -

-
-$profile_select -
- - - - -
-

Rykte online

-

-Ibland kanske dina vänner vill få reda på hur någon annan uppför sig på nätet innan de våga inleda någon kontakt. Du kan hjälpa till genom att ange personens 'rykte'. -

-
-$rating -
-
-

-Var vänlig ägna en liten stund åt att fylla i något som du känner kan vara till hjälp för andra. -

- -
-
-$groups - - - -
\ No newline at end of file diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl deleted file mode 100644 index fb66ef29b..000000000 --- a/view/sv/install_db.tpl +++ /dev/null @@ -1,38 +0,0 @@ -

Det sociala nätverket Friendika

-

Installation

- -

-För att kunna installera Friendika måste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministratör om du har frågor om dessa inställningar. Databasen du specar nedan måste finnas. Skapa databasen innan du fortsätter, om det inte redan är gjort. -

- -
- - - - - -
- - - -
- - - -
- - - -
- -
-Ange vilken tidszon som ska vara förvald på din webbplats -
- -$tzselect - -
- - -
-
diff --git a/view/sv/profile_advanced.php b/view/sv/profile_advanced.php deleted file mode 100644 index 0891d7ff1..000000000 --- a/view/sv/profile_advanced.php +++ /dev/null @@ -1,223 +0,0 @@ -Profile - - -EOT; - -if($a->profile['name']) { -$o .= <<< EOT -
-
Fullständigt namn:
-
{$a->profile['name']}
-
-
-EOT; -} - -if($a->profile['gender']) { -$o .= <<< EOT -
-
Kön:
-
{$a->profile['gender']}
-
-
-EOT; -} - -if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { -$o .= <<< EOT -
-
Födelsedag:
-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','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) - : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) - . "
\r\n
"; - -$o .= '
'; - -} - -if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { -$o .= <<< EOT -
-
Ålder:
-
$age
-
-
-EOT; -} - -if($a->profile['marital']) { -$o .= <<< EOT -
-
♥ Civilstatus:
-
{$a->profile['marital']}
-EOT; - -if($a->profile['with']) - $o .= "
({$a->profile['with']})
"; -$o .= <<< EOT -
-
-EOT; -} - -if($a->profile['sexual']) { -$o .= <<< EOT -
-
Sexuell läggning:
-
{$a->profile['sexual']}
-
-
-EOT; -} - -if($a->profile['homepage']) { - $homepage = linkify($a->profile['homepage']); -$o .= <<< EOT -
-
Hemsida URL:
-
$homepage
-
-
-EOT; -} - -if($a->profile['politic']) { -$o .= <<< EOT -
-
Politisk åskådning:
-
{$a->profile['politic']}
-
-
-EOT; -} - -if($a->profile['religion']) { -$o .= <<< EOT -
-
Religion:
-
{$a->profile['religion']}
-
-
-EOT; -} -if($txt = prepare_text($a->profile['about'])) { -$o .= <<< EOT -
-
Om:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['interest'])) { -$o .= <<< EOT -
-
Hobbys/Intressen:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['contact'])) { -$o .= <<< EOT -
-
Kontaktuppgifter och sociala nätverk:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['music'])) { -$o .= <<< EOT -
-
Musik:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['book'])) { -$o .= <<< EOT -
-
Böcker, litteratur:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['tv'])) { -$o .= <<< EOT -
-
TV:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['film'])) { -$o .= <<< EOT -
-
Film/dans/kultur/underhållning:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['romance'])) { -$o .= <<< EOT -
-
Kärlek/romantik:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['work'])) { -$o .= <<< EOT -
-
Arbete:
-
-
$txt
-
-
-EOT; -} - -if($txt = prepare_text($a->profile['education'])) { -$o .= <<< EOT -
-
Skola/utbildning:
-
-
$txt
-
-
-EOT; -} diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl deleted file mode 100644 index 5025fd5a8..000000000 --- a/view/sv/profile_edit.tpl +++ /dev/null @@ -1,298 +0,0 @@ -

Ändra i profil

- - - - - -$default - -
-
- -
- -
*
-
-
- -
- - -
-
- -
- - -
-
- - -
- -$gender -
-
- -
- -
-$dob $age -
-
-
- -$hide_friends - -
- -
-
- - -
- - -
-
- -
- - -
-
- - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- -
-
- -
- -$marital -
- - -
- -
- -$sexual -
-
- - - -
- - -
-
- -
- - -
-
- -
- - -
-
- -
- - -
(Used for suggesting potential friends, can be seen by others)
-
- -
- - -
(Används vid profilsökning, visas inte för andra)
-
- -
- -
-
- -
-

-Beskriv dig själv... -

- - - -
-
-
- - -
-

-Hobbys/Intressen -

- - - -
-
-
- - -
-

-Kontaktuppgifter och sociala nätverk -

- - - -
-
-
- - -
- -
-
- - -
-

-Musik -

- - - -
-
-
- -
-

-Böcker, litteratur -

- - - -
-
-
- - - -
-

-TV -

- - - -
-
-
- - - -
-

-Film/dans/kultur/underhållning -

- - - -
-
-
- - -
- -
-
- - -
-

-Kärlek/romantik -

- - - -
-
-
- - - -
-

-Arbete -

- - - -
-
-
- - - -
-

-Skola/utbildning -

- - - -
-
-
- - - -
- -
-
- - - -
- \ No newline at end of file diff --git a/view/sv/profile_entry_default.tpl b/view/sv/profile_entry_default.tpl deleted file mode 100644 index dff6b53f7..000000000 --- a/view/sv/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-Profilbild -
-
- -
-
diff --git a/view/sv/profile_photo.tpl b/view/sv/profile_photo.tpl deleted file mode 100644 index b849a270d..000000000 --- a/view/sv/profile_photo.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

Ladda upp profilbild

- -
- -
- - -
- -
- -
- -
- - \ No newline at end of file diff --git a/view/sv/pwdreset.tpl b/view/sv/pwdreset.tpl deleted file mode 100644 index 2c2d9e7e6..000000000 --- a/view/sv/pwdreset.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

Återställning av lösenord

- -

-Ditt lösenord har återställts enligt önskemål. -

-

-Ditt nya lösenord är -

-

-$newpass -

-

-Håll koll på det nya lösenordet och klicka sedan här för att logga in. -

-

-Lösenordet kan ändras på sidan Inställningar efter att du loggat in. \ No newline at end of file diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl deleted file mode 100644 index 2ab07af0c..000000000 --- a/view/sv/settings.tpl +++ /dev/null @@ -1,175 +0,0 @@ -

Kontoinställningar

- - - -$uexport - -$nickname_block - - -
- - -

Grundläggande inställningar

- -
- - -
-
- -
- - -
-
- - - -
- -$zoneselect -
-
- -
- - -
-
- -
- - -
-
- - - - -
- -$theme -
-
- -
- -
- - -

Säkerhets- och sekretessinställningar

- - - - -
- - -
(spamskydd)
-
-
- - - - -$profile_in_dir - -$profile_in_net_dir - - - -
- -
- - -
-
- -
- - -
-
- - -
Ta automatiskt bort inlägg som är äldre än dagar
-
- - - -
- -
- - - -

Inställningar för aviseringar

- - -
-
Skicka avisering via e-post när:
- - -
- - -
- - -
- - -
- - -
-
-
- -
- -
- - -

Lösenordsinställningar

- - -
-

-Lämna fältet tomt om du inte vill byta lösenord -

- - -
-
- -
- - -
-
- -
- $oidhtml -
-
- - -
- -
- - -

Avancerade inställningar

- -$pagetype - -
- -
diff --git a/view/sv/settings_nick_set.tpl b/view/sv/settings_nick_set.tpl deleted file mode 100644 index 34cb36e49..000000000 --- a/view/sv/settings_nick_set.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

-Din profiladress är '$nickname@$basepath' -

-$subdir - -
-
diff --git a/view/sv/settings_nick_subdir.tpl b/view/sv/settings_nick_subdir.tpl deleted file mode 100644 index 2702708ab..000000000 --- a/view/sv/settings_nick_subdir.tpl +++ /dev/null @@ -1,6 +0,0 @@ -

-Det verkar som att din webbsida finns i en undermapp på webbplatsen
-$hostname, så eventuellt kommer inte denna inställning att fungera tillförlitligt.
-

-

Om problem uppstår är det möjligt att problemen kan lösas genom att använda
profiladressen '$baseurl/profile/$nickname' istället. -

\ No newline at end of file diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index bfa004a65..32d88493c 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -621,6 +621,11 @@ input#dfrn-url { #profile-photo-link-select-wrapper { margin-top: 2em; } + +#profile-photo-submit-wrapper { + margin-top: 10px; +} + #profile-photo-wrapper img { width:175px; height:175px;