aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/profile_advanced.php (renamed from view/fr/profile_advanced.php)106
-rw-r--r--mod/contacts.php8
-rw-r--r--mod/install.php10
-rw-r--r--mod/lostpass.php7
-rw-r--r--mod/profile.php11
-rw-r--r--mod/profile_photo.php6
-rw-r--r--mod/profiles.php38
-rw-r--r--mod/settings.php54
-rw-r--r--util/messages.po668
-rw-r--r--util/strings.php109
-rw-r--r--view/contact_edit.tpl (renamed from view/en/contact_edit.tpl)20
-rw-r--r--view/de/contact_edit.tpl86
-rw-r--r--view/de/install_db.tpl40
-rw-r--r--view/de/profile_advanced.php226
-rw-r--r--view/de/profile_photo.tpl18
-rw-r--r--view/de/pwdreset.tpl16
-rw-r--r--view/de/settings.tpl177
-rw-r--r--view/de/settings_nick_set.tpl9
-rw-r--r--view/de/settings_nick_subdir.tpl9
-rw-r--r--view/en/install_db.tpl40
-rw-r--r--view/en/profile_advanced.php225
-rw-r--r--view/en/profile_edit.tpl299
-rw-r--r--view/en/profile_entry_default.tpl9
-rw-r--r--view/en/pwdreset.tpl16
-rw-r--r--view/fr/contact_edit.tpl83
-rw-r--r--view/fr/profile_edit.tpl299
-rw-r--r--view/fr/profile_entry_default.tpl9
-rw-r--r--view/fr/profile_photo.tpl18
-rw-r--r--view/fr/pwdreset.tpl18
-rw-r--r--view/fr/settings.tpl175
-rw-r--r--view/fr/settings_nick_set.tpl9
-rw-r--r--view/fr/settings_nick_subdir.tpl7
-rw-r--r--view/install_db.tpl (renamed from view/fr/install_db.tpl)16
-rw-r--r--view/it/contact_edit.tpl80
-rw-r--r--view/it/install_db.tpl40
-rw-r--r--view/it/profile_advanced.php226
-rw-r--r--view/it/profile_edit.tpl299
-rw-r--r--view/it/profile_entry_default.tpl9
-rw-r--r--view/it/profile_photo.tpl18
-rw-r--r--view/it/pwdreset.tpl16
-rw-r--r--view/it/settings.tpl175
-rw-r--r--view/it/settings_nick_set.tpl9
-rw-r--r--view/it/settings_nick_subdir.tpl7
-rw-r--r--view/profile_edit.tpl (renamed from view/de/profile_edit.tpl)86
-rw-r--r--view/profile_entry_default.tpl (renamed from view/de/profile_entry_default.tpl)2
-rw-r--r--view/profile_photo.tpl (renamed from view/en/profile_photo.tpl)8
-rw-r--r--view/pwdreset.tpl17
-rw-r--r--view/settings.tpl (renamed from view/en/settings.tpl)60
-rw-r--r--view/settings_nick_set.tpl (renamed from view/en/settings_nick_set.tpl)4
-rw-r--r--view/settings_nick_subdir.tpl (renamed from view/en/settings_nick_subdir.tpl)0
-rw-r--r--view/sv/contact_edit.tpl80
-rw-r--r--view/sv/install_db.tpl38
-rw-r--r--view/sv/profile_advanced.php223
-rw-r--r--view/sv/profile_edit.tpl298
-rw-r--r--view/sv/profile_entry_default.tpl9
-rw-r--r--view/sv/profile_photo.tpl18
-rw-r--r--view/sv/pwdreset.tpl16
-rw-r--r--view/sv/settings.tpl175
-rw-r--r--view/sv/settings_nick_set.tpl8
-rw-r--r--view/sv/settings_nick_subdir.tpl6
-rw-r--r--view/theme/duepuntozero/style.css5
61 files changed, 955 insertions, 3818 deletions
diff --git a/view/fr/profile_advanced.php b/include/profile_advanced.php
index e5e046025..8c4ba7698 100644
--- a/view/fr/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -1,46 +1,54 @@
<?php
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profil</h2>
+function advanced_profile(&$a) {
+$o .= '';
-EOT;
+$o .= '<h2>' . t('Profile') . '</h2>';
if($a->profile['name']) {
+ $lbl_fullname = t('Full Name:');
+ $fullname = $a->profile['name'];
+
$o .= <<< EOT
<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Nom complet:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
+<div id="advanced-profile-name-text">$lbl_fullname</div>
+<div id="advanced-profile-name">$fullname</div>
</div>
<div id="advanced-profile-name-end"></div>
EOT;
}
if($a->profile['gender']) {
+ $lbl_gender = t('Gender:');
+ $gender = $a->profile['gender'];
+
$o .= <<< EOT
<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Genre:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
+<div id="advanced-profile-gender-text">$lbl_gender</div>
+<div id="advanced-profile-gender">$gender</div>
</div>
<div id="advanced-profile-gender-end"></div>
EOT;
}
if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
+ $lbl_birthday = t('Birthday:');
+
$o .= <<< EOT
<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Date de naissance/anniversaire:</div>
+<div id="advanced-profile-dob-text">$lbl_birthday</div>
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 .= '<div id="advanced-profile-dob">'
. ((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)))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';
@@ -48,9 +56,10 @@ $o .= '<div id="advanced-profile-dob-end"></div>';
}
if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
+ $lbl_age = t('Age:');
$o .= <<< EOT
<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
+<div id="advanced-profile-age-text">$lbl_age</div>
<div id="advanced-profile-age">$age</div>
</div>
<div id="advanced-profile-age-end"></div>
@@ -58,14 +67,19 @@ EOT;
}
if($a->profile['marital']) {
+ $lbl_marital = t('<span class="heart">&hearts;</span> Status:');
+ $marital = $a->profile['marital'];
+
$o .= <<< EOT
<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Statut:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
+<div id="advanced-profile-marital-text">$lbl_marital</div>
+<div id="advanced-profile-marital">$marital</div>
EOT;
-if($a->profile['with'])
- $o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
+if($a->profile['with']) {
+ $with = $a->profile['with'];
+ $o .= "<div id=\"advanced-profile-with\">($with)</div>";
+}
$o .= <<< EOT
</div>
<div id="advanced-profile-marital-end"></div>
@@ -73,20 +87,24 @@ EOT;
}
if($a->profile['sexual']) {
+ $lbl_sexual = t('Sexual Preference:');
+ $sexual = $a->profile['sexual'];
+
$o .= <<< EOT
<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Attirances sexuelles:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
+<div id="advanced-profile-sexual-text">$lbl_sexual</div>
+<div id="advanced-profile-sexual">$sexual</div>
</div>
<div id="advanced-profile-sexual-end"></div>
EOT;
}
if($a->profile['homepage']) {
+ $lbl_homepage = t('Homepage:');
$homepage = linkify($a->profile['homepage']);
$o .= <<< EOT
<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Site web:</div>
+<div id="advanced-profile-homepage-text">$lbl_homepage</div>
<div id="advanced-profile-homepage">$homepage</div>
</div>
<div id="advanced-profile-homepage-end"></div>
@@ -94,29 +112,33 @@ EOT;
}
if($a->profile['politic']) {
+ $lbl_politic = t('Policial Views:');
+ $politic = $a->profile['politic'];
$o .= <<< EOT
<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Opinions politiques:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
+<div id="advanced-profile-politic-text">$lbl_politic</div>
+<div id="advanced-profile-politic">$politic</div>
</div>
<div id="advanced-profile-politic-end"></div>
EOT;
}
if($a->profile['religion']) {
+ $lbl_religion = t('Religion:');
+ $religion = $a->profile['religion'];
$o .= <<< EOT
<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
+<div id="advanced-profile-religion-text">$lbl_religion</div>
+<div id="advanced-profile-religion">$religion</div>
</div>
<div id="advanced-profile-religion-end"></div>
EOT;
}
-
if($txt = prepare_text($a->profile['about'])) {
+ $lbl_about = t('About:');
$o .= <<< EOT
<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">À propos:</div>
+<div id="advanced-profile-about-text">$lbl_about</div>
<br />
<div id="advanced-profile-about">$txt</div>
</div>
@@ -125,9 +147,10 @@ EOT;
}
if($txt = prepare_text($a->profile['interest'])) {
+ $lbl_interests = t('Hobbies/Interests:');
$o .= <<< EOT
<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Marottes/Centres d'intérêt:</div>
+<div id="advanced-profile-interest-text">$lbl_interests</div>
<br />
<div id="advanced-profile-interest">$txt</div>
</div>
@@ -136,9 +159,10 @@ EOT;
}
if($txt = prepare_text($a->profile['contact'])) {
+ $lbl_contact = t('Contact information and Social Networks:');
$o .= <<< EOT
<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Coordonées et réseaux sociaux:</div>
+<div id="advanced-profile-contact-text">$lbl_contact</div>
<br />
<div id="advanced-profile-contact">$txt</div>
</div>
@@ -147,9 +171,10 @@ EOT;
}
if($txt = prepare_text($a->profile['music'])) {
+ $lbl_music = t('Musical interests:');
$o .= <<< EOT
<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Goûts musicaux:</div>
+<div id="advanced-profile-music-text">$lbl_music</div>
<br />
<div id="advanced-profile-music">$txt</div>
</div>
@@ -158,9 +183,10 @@ EOT;
}
if($txt = prepare_text($a->profile['book'])) {
+ $lbl_book = t('Books, literature:');
$o .= <<< EOT
<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Livres, littérature:</div>
+<div id="advanced-profile-book-text">$lbl_book</div>
<br />
<div id="advanced-profile-book">$txt</div>
</div>
@@ -169,9 +195,10 @@ EOT;
}
if($txt = prepare_text($a->profile['tv'])) {
+ $lbl_tv = t('Television:');
$o .= <<< EOT
<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Télévision:</div>
+<div id="advanced-profile-tv-text">$lbl_tv</div>
<br />
<div id="advanced-profile-tv">$txt</div>
</div>
@@ -180,9 +207,10 @@ EOT;
}
if($txt = prepare_text($a->profile['film'])) {
+ $lbl_film = t('Film/dance/culture/entertainment:');
$o .= <<< EOT
<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Cinéma/Danse/Culture/Divertissement:</div>
+<div id="advanced-profile-film-text">$lbl_film</div>
<br />
<div id="advanced-profile-film">$txt</div>
</div>
@@ -191,9 +219,10 @@ EOT;
}
if($txt = prepare_text($a->profile['romance'])) {
+ $lbl_romance = t('Love/Romance:');
$o .= <<< EOT
<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Amour/Passion:</div>
+<div id="advanced-profile-romance-text">$lbl_romance</div>
<br />
<div id="advanced-profile-romance">$txt</div>
</div>
@@ -202,9 +231,10 @@ EOT;
}
if($txt = prepare_text($a->profile['work'])) {
+ $lbl_work = t('Work/employment:');
$o .= <<< EOT
<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Travail/Activité professionnelle:</div>
+<div id="advanced-profile-work-text">$lbl_work</div>
<br />
<div id="advanced-profile-work">$txt</div>
</div>
@@ -213,9 +243,10 @@ EOT;
}
if($txt = prepare_text($a->profile['education'])) {
+ $lbl_education = t('School/education:');
$o .= <<< EOT
<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">École/études:</div>
+<div id="advanced-profile-education-text">$lbl_education</div>
<br />
<div id="advanced-profile-education">$txt</div>
</div>
@@ -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 <em>reputation</em> 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' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+ '$lbl6' => t('Your password may be changed from the <em>Settings</em> 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'), '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
));
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('<span class="heart">&hearts;</span> 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 <strong>not published</strong>.') . 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 = '<select name="theme" id="theme-select" >';
$files = glob('view/theme/*');
@@ -344,13 +333,16 @@ function settings_content(&$a) {
}
$theme_selector .= '</select>';
+ $subdir = ((strlen($a->get_path())) ? '<br />' . 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
+msgstr ""
+
+#: ../../mod/contacts.php:266
+#, 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 "Contact Information / Notes"
+msgstr ""
+
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
+msgstr ""
+
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
+msgstr ""
+
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> 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 "Visit $name's profile"
msgstr ""
-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:273
msgid "Block/Unblock contact"
msgstr ""
-#: ../../mod/contacts.php:266
+#: ../../mod/contacts.php:274
msgid "Ignore contact"
msgstr ""
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:275
msgid "Delete contact"
msgstr ""
-#: ../../mod/contacts.php:269
+#: ../../mod/contacts.php:277
msgid "Last updated: "
msgstr ""
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:278
msgid "Update public posts: "
msgstr ""
-#: ../../mod/contacts.php:272
+#: ../../mod/contacts.php:280
msgid "Update now"
msgstr ""
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:283
msgid "Unblock this contact"
msgstr ""
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:283
msgid "Block this contact"
msgstr ""
-#: ../../mod/contacts.php:276
+#: ../../mod/contacts.php:284
msgid "Unignore this contact"
msgstr ""
-#: ../../mod/contacts.php:276
+#: ../../mod/contacts.php:284
msgid "Ignore this contact"
msgstr ""
-#: ../../mod/contacts.php:279
+#: ../../mod/contacts.php:287
msgid "Currently blocked"
msgstr ""
-#: ../../mod/contacts.php:280
+#: ../../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 <em>Settings</em> 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 <strong>not published</strong>."
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 <a href=\"http://creativecommons.org/"
"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> 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 "<span class=\"heart\">&hearts;</span> 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 <strong>public</strong> profile.<br />It <strong>may</strong> "
"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 "<span class=\"heart\">&hearts;</span> 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 <em>reputation</em> to guide them.'] = 'You may help them choose whether or not to interact with this person by providing a <em>reputation</em> 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 <em>Settings</em> page after successful login.'] = 'Your password may be changed from the <em>Settings</em> 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['<span class="heart">&hearts;</span> Marital Status:'] = '<span class="heart">&hearts;</span> 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 <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'This is your <strong>public</strong> profile.<br />It <strong>may</strong> 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["&nbsp;\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 <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
+$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['<span class="heart">&hearts;</span> Status:'] = '<span class="heart">&hearts;</span> 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
index 9aca60188..4c2c6c6f8 100644
--- a/view/en/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -28,7 +28,7 @@
<div id="contact-edit-poll-wrapper">
- <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
+ <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
<div id="contact-edit-poll-text">$updpub</div>
$poll_interval
<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
@@ -41,41 +41,41 @@ $blocked
$ignored
<div id="contact-edit-info-wrapper">
-<h4>Contact Information / Notes</h4>
+<h4>$lbl_info1</h4>
<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
</div>
<div id="contact-edit-info-end"></div>
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
<div id="contact-edit-profile-select-text">
-<h4>Profile Visibility</h4>
-<p>Please choose the profile you would like to display to $name when viewing your profile securely.
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2
</p>
</div>
$profile_select
<div id="contact-edit-profile-select-end"></div>
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
<div id="contact-edit-rating-wrapper">
-<h4>Online Reputation</h4>
+<h4>$lbl_rep1</h4>
<p>
-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
</p>
<div id="contact-edit-rating-select-wrapper">
$rating
</div>
<div id="contact-edit-rating-explain">
<p>
-Please take a moment to elaborate on this selection if you feel it could be helpful to others.
+$lbl_rep4
</p>
<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
</div>
</div>
$groups
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
</form>
</div>
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 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
- </div>
- <div id="contact-edit-photo-end" ></div>
- </div>
- <div id="contact-edit-nav-wrapper" >
-
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
- <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
- </div>
- <div id="contact-drop-links" >
- <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
- </div>
- <div id="contact-edit-nav-end"></div>
-
-
- <div id="contact-edit-poll-wrapper">
- <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
- <div id="contact-edit-poll-text">$updpub</div>
- $poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
- </div>
- </div>
- <div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-
-<div id="contact-edit-info-wrapper">
-<h4>Kontaktinformation / Notizen</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Profil Sichtbarkeit</h4>
-<p>Bitte wähle das Profil, das du $name gezeigt werden soll, wenn er sich dein
-Profil in Friendika betrachtet.
-</p>
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Online Reputation</h4>
-<p>
-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.
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Bitte nimm dir einen Moment um deine Auswahl zu kommentieren wenn du meinst das
-könnte anderen weiter helfen.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-</form>
-</div>
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 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installation</h3>
-
-<p>
-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.
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Datenbank Servername</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Datenbank Anmeldename</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Datenbank Anmeldepassword</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Datenbankname</label>
-<input type="text" name="dbdata" id="install-dbdata" value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Bitte wähle die Standard-Zeitzone deiner Webseite
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-<div id="install-end" ></div>
-
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 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Full Name:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Gender:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Birthday:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">'
- . ((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')))
- . "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
- $o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexual Preference:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
- $homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Political Views:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">About:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musical interests:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Books, literature:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Television:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Love/romance:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Work/employment:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">School/education:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-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 @@
-<h1>Profilbild Hochladen</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Datei hochladen: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-oder <a href='photos/$user'>wähle ein Bild aus einem Album</a>
-</div>
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 @@
-<h3>Zurücksetzen des Passworts</h3>
-
-<p>
-Dein Passwort wurde wie gewünscht zurück gesetzt.
-</p>
-<p>
-Dein neues Passwort lautet:
-</p>
-<p>
-$newpass
-</p>
-<p>
-Sichere oder kopiere dein neues Passwort und melde dich <a href="$baseurl" >dann hier an</a>.
-</p>
-<p>
-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 @@
-<h1>Account Einstellungen</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Plugin Einstellungen</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Grundeinstellungen</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Kompletter Name: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >EMail Adresse: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Deine Zeitzone: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Standardwert Sendestandort: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Browser Standort verwenden: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Anzeige Thema: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Sicherheits und Privatsphären Einstellungen</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximale Anzahl an Freundschaftsanfragen pro Tagy</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(um SPAM zu verhindern)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
- <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
- <div id="settings-default-perms-menu-end"></div>
-
- <div id="settings-default-perms-select" style="display: none;" >
-
- $aclselect
-
- </div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
-<div id="settings-expire-end"></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-
-<h3 class="settings-heading">Benachrichtigungs Einstellungen</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Benachrichtigungsemail senden wenn: </div>
-<label for="notify1" id="settings-label-notify1">Du eine Vorstellung empfängst</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Deine Vorstellung bestätigt wurde</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Jemand etwas auf deiner Profilwand postet</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Jemand einen Folgebeitrag schreibt</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Du eine private Nachricht erhälst</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Passwort Einstellungen</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Lass die Passwortfelder frei außer du willst das Passwort ändern.
-</p>
-<label id="settings-password-label" for="settings-password" >Neues Passwort: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Bestätigen: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
- $oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Erweiterte Seiteneinstellungen</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
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 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">Deine Profiladresse lautet <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
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 @@
-<p>
-Es scheint so als ob deine Friendika Installation in einem Unterverzeichnis von $hostname
-liegt, es könnte deshalb unzuverlässig arbeiten.
-</p>
-<p>
-Solltest du irgendwelche Probleme haben versuche bitte folgende Profil Adresse
-'<strong>$baseurl/profile/$nickname</strong>' eventuell funktioniert es damit
-besser.
-</p>
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 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installation</h3>
-
-<p>
-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.
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Database Name</label>
-<input type="text" name="dbdata" id="install-dbdata" value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Please select a default timezone for your website
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-<div id="install-end" ></div>
-
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 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Full Name:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Gender:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Birthday:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">'
- . ((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')))
- . "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
- $o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexual Preference:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
- $homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Political Views:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">About:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musical interests:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Books, literature:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Television:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Love/romance:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Work/employment:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">School/education:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-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 @@
-<h1>Edit Profile Details</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Tell us about yourself...
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Hobbies/Interests
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Contact information and Social Networks
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Musical interests
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-Books, literature
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-Television
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Film/dance/culture/entertainment
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-Love/romance
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Work/employment
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-School/education
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script> \ 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 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
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 @@
-<h3>Password Reset</h3>
-
-<p>
-Your password has been reset as requested.
-</p>
-<p>
-Your new password is
-</p>
-<p>
-$newpass
-</p>
-<p>
-Save or copy your new password - and then <a href="$baseurl" >click here to login</a>.
-</p>
-<p>
-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 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
- </div>
- <div id="contact-edit-photo-end" ></div>
- </div>
- <div id="contact-edit-nav-wrapper" >
-
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
- <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
- </div>
- <div id="contact-drop-links" >
- <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
- </div>
- <div id="contact-edit-nav-end"></div>
-
-
-
- <div id="contact-edit-poll-wrapper">
- <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
- <div id="contact-edit-poll-text">$updpub</div>
- $poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
- </div>
- </div>
- <div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-
-<div id="contact-edit-info-wrapper">
-<h4>Informations / Notes du contact</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Visibilité du profil</h4>
-<p>Merci de choisir le profil que vous souhaitez afficher à $name lorsqu'il consulte votre page de manière sécurisée.
-</p>
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Réputation</h4>
-<p>
-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".
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Merci de prendre un moment pour développer si vous pensez que cela peut être utile à d'autres.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Sauver" />
-</form>
-</div>
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 @@
-<h1>Éditer les détails du profil</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="Voir ce profil">Voir ce profil</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Créer un nouveau profil en utilisant les réglages de celui-ci">Cloner ce profil</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Supprimer ce profil" $disabled >Supprimer ce profil</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Nom du profil: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Votre nom complet: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titre/descriptif: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Votre genre: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Votre anniversaire (j/m/a): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Adresse postale: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Localité/Ville: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Code postal: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Pays: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Région/état: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>Statut (marital): </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Qui: (si pertinent) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Attirance sexuelle: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Site web personnel: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Opinions politiques: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Mots clés publics: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exemple: football photographie programmation" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Utilisés pour les amis potentiels, peuvent être vus)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Mots clés privés: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exemple: football photographie programmation" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Utilisés lors des recherches, ne sont jamais montrés à personne)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Parlez nous de vous...
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Marottes/Centre d'intérêts
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Coordonnées et réseau sociaux
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Goûts musicaux
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-Livres, littérature
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-Télévision
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Cinéma/Danse/Culture/Divertissement
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-Amour/Passion
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Travail/activité professionnelle
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-École/études
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
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 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Image du profil" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
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 @@
-<h1>Téléverser une photo de profil</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Fichier à téléverser: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Envoyer">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-ou <a href='photos/$user'>choisissez une photo dans vos albums</a>
-</div>
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 @@
-<h3>Mot de passe réinitialisé</h3>
-
-<p>
-Votre mot de passe a été changé, comme demandé.
-</p>
-<p>
-Votre nouveau mot de passe est
-</p>
-<p>
-$newpass
-</p>
-<p>
-Sauvez ou copiez ce nouveau mot de passe - puis <a href="$baseurl" >connectez-vous</a>.
-
-</p>
-<p>
-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 @@
-<h1>Réglages du compte</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Réglages des extensions</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Réglages basiques</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Nom complet: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Adresse de courriel: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Votre fuseau horaire: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Localisation par défaut: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Utiliser les informations géographiques du navigateur: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Thème affiché: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-<h3 class="settings-heading">Sécurité et vie privée</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Nombre maximum de demandes d'amitié par jour</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(pour limiter le spam)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
- <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
- <div id="settings-default-perms-menu-end"></div>
-
- <div id="settings-default-perms-select" style="display: none;" >
-
- $aclselect
-
- </div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Autoriser les amis à publier sur votre profil: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-<div id="settings-expire-desc">Faire automatiquement expirer (supprimer) les publications de plus de <input type="text" size="3" name="expire" value="$expire" /> jours</div>
-<div id="settings-expire-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-
-<h3 class="settings-heading">Notifications</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Envoyer un courriel d'alerte quand: </div>
-<label for="notify1" id="settings-label-notify1">Vous recevez une introduction</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Une de vos introductions est validée</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Quelqu'un a écrit sur votre mur</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Quelqu'un a commenté</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Vous avez reçu un message privée</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-<h3 class="settings-heading">Mot de passe</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Laissez le champ vide, sauf si vous souhaitez le changer
-</p>
-<label id="settings-password-label" for="settings-password" >Nouveau mot de passe: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirmation: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
- $oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-<h3 class="settings-heading">Réglages avancés</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
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 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">L'adresse de votre profil est <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
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 @@
-<p>
-Il semble que votre site soit situé dans un sous-répertoire du<br />
-site $hostname, ce réglage pourrait donc ne pas marcher comme prévu.<br />
-</p>
-<p>Si vous avez le moindre problème, essayez d'utiliser l'adresse <br />
-de profil suivante : '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
diff --git a/view/fr/install_db.tpl b/view/install_db.tpl
index b6aea3e49..1c59dbdb9 100644
--- a/view/fr/install_db.tpl
+++ b/view/install_db.tpl
@@ -1,33 +1,33 @@
-<h3>Réseau Social Friendika</h3>
-<h3>Installation</h3>
+<h3>$lbl_01</h3>
+<h3>$lbl_02</h3>
<p>
-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
</p>
<form id="install-form" action="$baseurl/install" method="post">
<input type="hidden" name="phpath" value="$phpath" />
-<label for="install-dbhost" id="install-dbhost-label">Nom du serveur</label>
+<label for="install-dbhost" id="install-dbhost-label">$lbl_06</label>
<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
<div id="install-dbhost-end"></div>
-<label for="install-dbuser" id="install-dbuser-label">Nom d'utilisateur</label>
+<label for="install-dbuser" id="install-dbuser-label">$lbl_07</label>
<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
<div id="install-dbuser-end"></div>
-<label for="install-dbpass" id="install-dbpass-label">Mot de passe</label>
+<label for="install-dbpass" id="install-dbpass-label">$lbl_08</label>
<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
<div id="install-dbpass-end"></div>
-<label for="install-dbdata" id="install-dbdata-label">Nom de la base</label>
+<label for="install-dbdata" id="install-dbdata-label">$lbl_09</label>
<input type="text" name="dbdata" id="install-dbdata" value="$dbdata" />
<div id="install-dbdata-end"></div>
<div id="install-tz-desc">
-Merci de choisir un fuseau horaire par défaut
+$lbl_10
</div>
$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 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
- </div>
- <div id="contact-edit-photo-end" ></div>
- </div>
- <div id="contact-edit-nav-wrapper" >
-
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
- <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
- </div>
- <div id="contact-drop-links" >
- <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
- </div>
- <div id="contact-edit-nav-end"></div>
-
-
- <div id="contact-edit-poll-wrapper">
- <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
- <div id="contact-edit-poll-text">$updpub</div>
- $poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
- </div>
- </div>
- <div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-
-<div id="contact-edit-info-wrapper">
-<h4>Informazioni di contatto / Note</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
-
-
-<div id="contact-edit-profile-select-text">
-<h4>Visibilt&agrave; Profilo</h4>
-<p>Scegli il profilo che vuoi mostrare a $name quando guarda il tuo profilo in modo sicuro.</p>
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Reputazione Online</h4>
-<p>Puo' capitare che i tuoi amici vogliano sapere la legittimit&agrave; online dei questa persona. Puoi aiutarli a scegliere se interagire o no con questa persona fornendo una 'reputazione' per guidarli.</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Prenditi un momento per pensare su questa selezione se senti che puo' essere utile ad altri.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
-</form>
-</div>
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 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installazione</h3>
-
-<p>
-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.
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Nome Server Database</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Nome Login Database</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Password Login Database</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Nome Database</label>
-<input type="text" name="dbdata" id="install-dbdata" value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Seleziona il fuso orario del tuo sito web
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-<div id="install-end" ></div>
-
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 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profilo</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Nome Completo:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Genere:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Compleanno:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">'
- . ((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')))
- . "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Et&agrave;:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Stato:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
- $o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Preferenze sessuali:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
- $homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Orientamento politico:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religione:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">Informazioni varie:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbie/Interessi:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Informazioni su contatti e Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Interessi musicali:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Libri, letteratura:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Televisione:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/danza/cultura/intrattenimento:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Amore/romanticismo:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Lavoro/impiego:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">Scuola/educazione:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-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 @@
-<h1>Modifica i dettagli del profilo</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">Guarda questo profilo</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clona questo profilo</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Elimina questo profilo</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Nome profilo: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Il tuo nome completo: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Breve descrizione: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div><div id="profile-edit-pdesc-desc">(es. titolo, posizione, altro)</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Il tuo sesso: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Data di nascia (a/m/g): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Indirizzo: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Localit&agrave;/Citt&agrave;: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >CAP: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Stato: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Regione: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>Stato sentimentale: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Con chi: </label>
-<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Preferenza sessuale: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Indirizzo homepage: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Orientamento politico: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religione: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >[Public] Parole chiave: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Esempio: pescare fotografia software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Parole chiave: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Esempio: pescare fotografia software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Usati per la ricerca dei profili, mai mostrati agli altri)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Raccontaci di te....
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Hobbie/Interessi
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Informazioni su contatti e Social network
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Interessi musicali
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-Libri, letteratura
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-Televisione
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Film/danza/cultura/intrattenimento
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-Amore/romanticismo
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Lavoro/impiego
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-Scuola/educazione
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
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 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Immagine Profilo" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
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 @@
-<h1>Carica foto del profilo</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Carica File: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Carica">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-o <a href='photos/$user'>seleziona una foto da un album</a>
-</div> \ 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 @@
-<h3>Resetta Password</h3>
-
-<p>
-La tua password &egrave; stata resettata come richiesto.
-</p>
-<p>
-La tua nuova password &egrave;
-</p>
-<p>
-$newpass
-</p>
-<p>
-Salva o copia la tua nuova password, e quindi <a href="$baseurl" >clicca qui per accedere</a>.
-</p>
-<p>
-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 @@
-<h1>Impostazioni account</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Impostazioni Plugin</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Impostazioni base</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Nome Completo: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Indirizzo Email: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Il tuo fuso orario: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Localit&agrave; di default per l'invio: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Usa la localit&agrave; rilevata dal browser: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Tema: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-<h3 class="settings-heading">Impostazioni di Sicurezza e Privacy</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Numero massimo di richieste di amicizia per giorno</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(per prevenire lo spam)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
- <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
- <div id="settings-default-perms-menu-end"></div>
-
- <div id="settings-default-perms-select" style="display: none;" >
-
- $aclselect
-
- </div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Permetti agli amici di inviare messaggi sulla tua pagina del profilo: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-<div id="settings-expire-desc">Cancella automaticamente i messaggi pi&ugrave; vecchi di <input type="text" size="3" name="expire" value="$expire" /> giorni</div>
-<div id="settings-expire-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-
-<h3 class="settings-heading">Impostazione Notifiche</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Invia una mail di notifica quando: </div>
-<label for="notify1" id="settings-label-notify1">Ricevi una presentazione</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Le tue presentazioni sono confermate</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Qualcuno scrive sulla bacheca del tuo profilo</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Qualcuno scrive un commento a un tuo messaggio</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Ricevi un messaggio privato</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-<h3 class="settings-heading">Impostazioni Password</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Lascia questi campi in bianco per non effettuare variazioni alla password
-</p>
-<label id="settings-password-label" for="settings-password" >Nuova Password: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Conferma: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
- $oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-<h3 class="settings-heading">Impostazioni Avanzate Account</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
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 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">L'indirizzo del tuo profilo &egrave; <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
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 @@
-<p>
-Sembra che il tuo sito web sia in una sottocartella del sito<br />
-$hostname. Qualche impostazione potrebbe non funzionare correttamente.<br />
-</p>
-<p>
-Se hai problemi, potresti avere migliori risultati usando l'inidirizzo<br /> '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
diff --git a/view/de/profile_edit.tpl b/view/profile_edit.tpl
index 0b0619420..6e27dfca5 100644
--- a/view/de/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -1,11 +1,11 @@
-<h1>Proil Details Bearbeiten</h1>
+<h1>$banner</h1>
<div id="profile-edit-links">
<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
+<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
+<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
</ul>
</div>
@@ -18,32 +18,32 @@ $default
<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
</div>
<div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
+<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
</div>
<div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
</div>
<div id="profile-edit-pdesc-end"></div>
<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
+<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
$gender
</div>
<div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
+<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
<div id="profile-edit-dob" >
$dob $age
</div>
@@ -53,32 +53,32 @@ $dob $age
$hide_friends
<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
+<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
</div>
<div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
+<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
</div>
<div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
</div>
<div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
<option selected="selected" >$country_name</option>
<option>temp</option>
@@ -87,7 +87,7 @@ $hide_friends
<div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
+<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >$region</option>
<option>temp</option>
@@ -96,20 +96,20 @@ $hide_friends
<div id="profile-edit-region-end"></div>
<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
+<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
$marital
</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
+<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
+<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
<div id="profile-edit-marital-end"></div>
<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
+<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
$sexual
</div>
<div id="profile-edit-sexual-end"></div>
@@ -117,44 +117,44 @@ $sexual
<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
</div>
<div id="profile-edit-homepage-end"></div>
<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label>
+<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
</div>
<div id="profile-edit-politic-end"></div>
<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
+<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
</div>
<div id="profile-edit-religion-end"></div>
<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="lbl_ex2" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
<div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
<div id="profile-edit-prvkeywords-end"></div>
<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="about-jot-wrapper" >
<p id="about-jot-desc" >
-Tell us about yourself...
+$lbl_about
</p>
<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
@@ -166,7 +166,7 @@ Tell us about yourself...
<div id="interest-jot-wrapper" >
<p id="interest-jot-desc" >
-Hobbies/Interests
+$lbl_hobbies
</p>
<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
@@ -178,7 +178,7 @@ Hobbies/Interests
<div id="contact-jot-wrapper" >
<p id="contact-jot-desc" >
-Contact information and Social Networks
+$lbl_social
</p>
<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
@@ -189,14 +189,14 @@ Contact information and Social Networks
<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="music-jot-wrapper" >
<p id="music-jot-desc" >
-Musical interests
+$lbl_music
</p>
<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
@@ -207,7 +207,7 @@ Musical interests
<div id="book-jot-wrapper" >
<p id="book-jot-desc" >
-Books, literature
+$lbl_book
</p>
<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
@@ -220,7 +220,7 @@ Books, literature
<div id="tv-jot-wrapper" >
<p id="tv-jot-desc" >
-Television
+$lbl_tv
</p>
<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
@@ -233,7 +233,7 @@ Television
<div id="film-jot-wrapper" >
<p id="film-jot-desc" >
-Film/dance/culture/entertainment
+$lbl_film
</p>
<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
@@ -244,14 +244,14 @@ Film/dance/culture/entertainment
<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="romance-jot-wrapper" >
<p id="romance-jot-desc" >
-Love/romance
+$lbl_love
</p>
<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
@@ -264,7 +264,7 @@ Love/romance
<div id="work-jot-wrapper" >
<p id="work-jot-desc" >
-Work/employment
+$lbl_work
</p>
<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
@@ -277,7 +277,7 @@ Work/employment
<div id="education-jot-wrapper" >
<p id="education-jot-desc" >
-School/education
+$lbl_school
</p>
<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
@@ -289,7 +289,7 @@ School/education
<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
</div>
<div class="profile-edit-submit-end"></div>
diff --git a/view/de/profile_entry_default.tpl b/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 @@
<div class="profile-listing" >
<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profilbild" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
</div>
<div class="profile-listing-photo-end" ></div>
<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
diff --git a/view/en/profile_photo.tpl b/view/profile_photo.tpl
index 30e51210a..f258b5b86 100644
--- a/view/en/profile_photo.tpl
+++ b/view/profile_photo.tpl
@@ -1,18 +1,18 @@
-<h1>Upload Profile Photo</h1>
+<h1>$title</h1>
<form enctype="multipart/form-data" action="profile_photo" method="post">
<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
+<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
<input name="userfile" type="file" id="profile-photo-upload" size="48" />
</div>
<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
+<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
</div>
</form>
<div id="profile-photo-link-select-wrapper">
-or <a href='photos/$user'>select a photo from albums</a>
+$select
</div> \ 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 @@
+<h3>$lbl1</h3>
+
+<p>
+$lbl2
+</p>
+<p>
+$lbl3
+</p>
+<p>
+$newpass
+</p>
+<p>
+$lbl4 $lbl5
+</p>
+<p>
+$lbl6
+</p>
diff --git a/view/en/settings.tpl b/view/settings.tpl
index 9822291c1..162299f5d 100644
--- a/view/en/settings.tpl
+++ b/view/settings.tpl
@@ -1,6 +1,6 @@
-<h1>Account Settings</h1>
+<h1>$ptitle</h1>
-<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
+<div id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a></div>
$uexport
@@ -10,16 +10,16 @@ $nickname_block
<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<h3 class="settings-heading">Basic Settings</h3>
+<h3 class="settings-heading">$lbl_basic</h3>
<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Full Name: </label>
+<label id="settings-username-label" for="settings-username" >$lbl_fn </label>
<input type="text" name="username" id="settings-username" value="$username" />
</div>
<div id="settings-username-end" ></div>
<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Email Address: </label>
+<label id="settings-email-label" for="settings-email" >$lbl_email </label>
<input type="text" name="email" id="settings-email" value="$email" />
</div>
<div id="settings-email-end" ></div>
@@ -27,19 +27,19 @@ $nickname_block
<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
+<label id="settings-timezone-label" for="timezone_select" >$lbl_tz </label>
$zoneselect
</div>
<div id="settings-timezone-end" ></div>
<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
+<label id="settings-defloc-label" for="settings-defloc" >$lbl_loc1 </label>
<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
</div>
<div id="settings-defloc-end" ></div>
<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
+<label id="settings-allowloc-label" for="settings-allowloc" >$lbl_loc2 </label>
<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
</div>
<div id="settings-allowloc-end" ></div>
@@ -48,25 +48,25 @@ $zoneselect
<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
+<label id="settings-theme-label" for="theme-select" >$lbl_theme </label>
$theme
</div>
<div id="settings-theme-end"></div>
<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
</div>
-<h3 class="settings-heading">Security and Privacy Settings</h3>
+<h3 class="settings-heading">$lbl_prv</h3>
<input type="hidden" name="visibility" value="$visibility" />
<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label>
+<label id="settings-maxreq-label" for="settings-maxreq" >$lbl_maxreq</label>
<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
+<div id="settings-maxreq-desc">$lbl_maxrdesc</div>
</div>
<div id="settings-maxreq-end"></div>
@@ -91,14 +91,14 @@ $profile_in_net_dir
<div id="settings-default-perms-end"></div>
<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
+<label id="settings-blockw-label" for="settings-blockw" >$lbl_rempost </label>
<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
</div>
<div id="settings-blockw-end" ></div>
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-desc">$lbl_exp1 <input type="text" size="3" name="expire" value="$expire" /> $lbl_exp2</div>
<div id="settings-expire-end"></div>
@@ -108,48 +108,48 @@ $profile_in_net_dir
-<h3 class="settings-heading">Notification Settings</h3>
+<h3 class="settings-heading">$lbl_not1</h3>
<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">You receive an introduction</label>
+<div id="settings-notify-desc">$lbl_not2 </div>
+<label for="notify1" id="settings-label-notify1">$lbl_not3</label>
<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label>
+<label for="notify2" id="settings-label-notify2">$lbl_not4</label>
<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label>
+<label for="notify3" id="settings-label-notify3">$lbl_not5</label>
<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
+<label for="notify4" id="settings-label-notify4">$lbl_not6</label>
<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">You receive a private message</label>
+<label for="notify5" id="settings-label-notify5">$lbl_not7</label>
<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
<div id="notify5-end"></div>
</div>
<div id="settings=notify-end"></div>
<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
</div>
-<h3 class="settings-heading">Password Settings</h3>
+<h3 class="settings-heading">$lbl_pass1</h3>
<div id="settings-password-wrapper" >
<p id="settings-password-desc" >
-Leave password fields blank unless changing
+$lbl_pass2
</p>
-<label id="settings-password-label" for="settings-password" >New Password: </label>
+<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
<input type="password" id="settings-password" name="npassword" />
</div>
<div id="settings-password-end" ></div>
<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
+<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
<input type="password" id="settings-confirm" name="confirm" />
</div>
<div id="settings-confirm-end" ></div>
@@ -161,16 +161,16 @@ Leave password fields blank unless changing
<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
</div>
-<h3 class="settings-heading">Advanced Page Settings</h3>
+<h3 class="settings-heading">$lbl_advn</h3>
$pagetype
<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
</div>
diff --git a/view/en/settings_nick_set.tpl b/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 @@
<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
-<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
+<span class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</span>
</p>
-$subdir
-
</div>
<div id="settings-nick-end" ></div>
diff --git a/view/en/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
index 303c24df7..303c24df7 100644
--- a/view/en/settings_nick_subdir.tpl
+++ b/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 @@
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
- </div>
- <div id="contact-edit-photo-end" ></div>
- </div>
- <div id="contact-edit-nav-wrapper" >
-
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
- <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
- </div>
- <div id="contact-drop-links" >
- <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
- </div>
- <div id="contact-edit-nav-end"></div>
-
-
- <div id="contact-edit-poll-wrapper">
- <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
- <div id="contact-edit-poll-text">$updpub</div>
- $poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
- </div>
- </div>
- <div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-<div id="contact-edit-info-wrapper">
-<h4>Kontaktuppgifter / Anteckningar</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Spara" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Profilvisning</h4>
-<p>V&auml;lj vilken profil som ska visas f&ouml;r $name n&auml;r han eller hon tittar p&aring; din profil i s&auml;kert l&auml;ge.
-</p>
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Spara" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Rykte online</h4>
-<p>
-Ibland kanske dina v&auml;nner vill f&aring; reda p&aring; hur n&aring;gon annan uppf&ouml;r sig p&aring; n&auml;tet innan de v&aring;ga inleda n&aring;gon kontakt. Du kan hj&auml;lpa till genom att ange personens 'rykte'.
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Var v&auml;nlig &auml;gna en liten stund &aring;t att fylla i n&aring;got som du k&auml;nner kan vara till hj&auml;lp f&ouml;r andra.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Skicka" />
-</form>
-</div> \ 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 @@
-<h3>Det sociala n&auml;tverket Friendika</h3>
-<h3>Installation</h3>
-
-<p>
-F&ouml;r att kunna installera Friendika m&aring;ste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministrat&ouml;r om du har fr&aring;gor om dessa inst&auml;llningar. Databasen du specar nedan m&aring;ste finnas. Skapa databasen innan du forts&auml;tter, om det inte redan &auml;r gjort.
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Servernamn d&auml;r databasen finns</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Inloggningsnamn f&ouml;r databasen</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">L&ouml;senord f&ouml;r databasen</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Databasens namn</label>
-<input type="text" name="dbdata" id="install-dbdata" value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Ange vilken tidszon som ska vara f&ouml;rvald p&aring; din webbplats
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-<div id="install-end" ></div>
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 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Fullst&auml;ndigt namn:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">K&ouml;n:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">F&ouml;delsedag:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">'
- . ((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')))
- . "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">&Aring;lder:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Civilstatus:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
- $o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexuell l&auml;ggning:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
- $homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Hemsida URL:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Politisk &aring;sk&aring;dning:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">Om:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbys/Intressen:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Kontaktuppgifter och sociala n&auml;tverk:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musik:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">B&ouml;cker, litteratur:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">TV:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dans/kultur/underh&aring;llning:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">K&auml;rlek/romantik:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Arbete:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">Skola/utbildning:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-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 @@
-<h1>&Auml;ndra i profil</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">Visa denna profil</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Klona denna profil</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Ta bort denna profil</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profilnamn: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Fullst&auml;ndigt namn: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titel/Beskrivning: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >K&ouml;n: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >F&ouml;delsedag (&aring;/m/d): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Gatuadress: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Plats/Stad: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postnummer: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Land: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> Civilst&aring;nd: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Vem: (om aktuellt) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexuell l&auml;ggning: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Hemsida URL: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Politisk &aring;sk&aring;dning: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Nyckelord: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exempel: fiske fotografering delifner" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Nyckelord: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exempel: fiske fotografering delfiner" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Anv&auml;nds vid profils&ouml;kning, visas inte f&ouml;r andra)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Beskriv dig sj&auml;lv...
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Hobbys/Intressen
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Kontaktuppgifter och sociala n&auml;tverk
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Musik
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-B&ouml;cker, litteratur
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-TV
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Film/dans/kultur/underh&aring;llning
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-K&auml;rlek/romantik
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Arbete
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-Skola/utbildning
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script> \ 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 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profilbild" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
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 @@
-<h1>Ladda upp profilbild</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Ladda upp fil: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Ladda upp">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-eller <a href='photos/$user'>v&auml;lj bild i ett album</a>
-</div> \ 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 @@
-<h3>&Aring;terst&auml;llning av l&ouml;senord</h3>
-
-<p>
-Ditt l&ouml;senord har &aring;terst&auml;llts enligt &ouml;nskem&aring;l.
-</p>
-<p>
-Ditt nya l&ouml;senord &auml;r
-</p>
-<p>
-$newpass
-</p>
-<p>
-H&aring;ll koll p&aring; det nya l&ouml;senordet och <a href="$baseurl" >klicka sedan h&auml;r f&ouml;r att logga in</a>.
-</p>
-<p>
-L&ouml;senordet kan &auml;ndras p&aring; sidan Inst&auml;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 @@
-<h1>Kontoinst&auml;llningar</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Inst&auml;llningar f&ouml;r insticksprogram</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Grundl&auml;ggande inst&auml;llningar</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Fullst&auml;ndigt namn: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >E-postadress: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Tidszon: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Standardplats: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Anv&auml;nd webbl&auml;sarens positioneringsfunktion: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Utseende (tema): </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-<h3 class="settings-heading">S&auml;kerhets- och sekretessinst&auml;llningar</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Max antal v&auml;nf&ouml;rfr&aring;gningar/dag</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(spamskydd)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
- <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
- <div id="settings-default-perms-menu-end"></div>
-
- <div id="settings-default-perms-select" style="display: none;" >
-
- $aclselect
-
- </div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >L&aring;t kontakter g&ouml;ra inl&auml;gg p&aring; din profilsida: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-<div id="settings-expire-desc">Ta automatiskt bort inl&auml;gg som &auml;r &auml;ldre &auml;n <input type="text" size="3" name="expire" value="$expire" /> dagar</div>
-<div id="settings-expire-end"></div>
-
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-
-<h3 class="settings-heading">Inst&auml;llningar f&ouml;r aviseringar</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Skicka avisering via e-post n&auml;r: </div>
-<label for="notify1" id="settings-label-notify1">Ny kontaktf&ouml;rfr&aring;gan kommer</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Egen f&ouml;rfr&aring;gan har godk&auml;nts</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">N&aring;gon skriver p&aring; din profilsida</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">N&aring;gon skriver en kommentar direkt efter din</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Du f&aring;r ett personligt meddelande</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-<h3 class="settings-heading">L&ouml;senordsinst&auml;llningar</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-L&auml;mna f&auml;ltet tomt om du inte vill byta l&ouml;senord
-</p>
-<label id="settings-password-label" for="settings-password" >Nytt l&ouml;senord: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Bekr&auml;fta (upprepa): </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
- $oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-<h3 class="settings-heading">Avancerade inst&auml;llningar</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
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 @@
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">Din profiladress &auml;r <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
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 @@
-<p>
-Det verkar som att din webbsida finns i en undermapp p&aring; webbplatsen<br />
-$hostname, s&aring; eventuellt kommer inte denna inst&auml;llning att fungera tillf&ouml;rlitligt.<br />
-</p>
-<p>Om problem uppst&aring;r &auml;r det m&ouml;jligt att problemen kan l&ouml;sas genom att anv&auml;nda<br /> profiladressen '<strong>$baseurl/profile/$nickname</strong>' ist&auml;llet.
-</p> \ 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;