From fa756ffcb987a37dae888bf84c9519d55a484da5 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 23 Dec 2010 21:32:13 +0100 Subject: OpenID delegation in profile page --- database.sql | 1 + mod/profile.php | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/database.sql b/database.sql index 5b86f60ec..bb151da27 100644 --- a/database.sql +++ b/database.sql @@ -377,6 +377,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, `deny_gid` mediumtext NOT NULL, + `openidserver` text NOT NULL, PRIMARY KEY (`uid`), KEY `nickname` (`nickname`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/mod/profile.php b/mod/profile.php index b1f020930..000e955ea 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -18,6 +18,31 @@ function profile_init(&$a) { profile_load($a,$which,$profile); + if (!get_config('system','no_openid') && $a->profile['openid']!=""){ + if (!isset($a->profile['openidserver'])){ + die('friendika user table must be updated. `openidserver` field is missing'); + } + if ($a->profile['openidserver']==''){ + require_once('library/openid.php'); + $openid = new LightOpenID; + $openid->identity = $a->profile['openid']; + $a->profile['openidserver'] = $openid->discover($openid->identity); + + q("UPDATE `user` SET `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", + dbesc($a->profile['openidserver']), + intval($a->profile['uid']) + ); + } + + + $a->page['htmlhead'] .= ''. "\r\n"; + $a->page['htmlhead'] .= ''. "\r\n"; + + + } + + + $a->page['htmlhead'] .= '' . "\r\n" ; $a->page['htmlhead'] .= '' . "\r\n" ; $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); @@ -365,4 +390,4 @@ function profile_content(&$a, $update = 0) { $o .= paginate($a); return $o; -} \ No newline at end of file +} -- cgit v1.2.3 From dd83923057643888cc1c6dbb8ded9d52e766f525 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 23 Dec 2010 21:33:45 +0100 Subject: Translatable "Welcome to" in home --- mod/home.php | 4 ++-- util/strings.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/home.php b/mod/home.php index 59cc31d3b..53b111bdf 100644 --- a/mod/home.php +++ b/mod/home.php @@ -19,7 +19,7 @@ function home_content(&$a) { * $a->page['footer'] = ''; * $a->page['footer'] .= "

"; */ - $o .= '

Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '

'; + $o .= '

' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '

'; if(file_exists('home.html')) $o .= file_get_contents('home.html'); @@ -27,4 +27,4 @@ function home_content(&$a) { return $o; -}} \ No newline at end of file +}} diff --git a/util/strings.php b/util/strings.php index 39d66a3a9..6e6c4b27c 100644 --- a/util/strings.php +++ b/util/strings.php @@ -4,6 +4,7 @@ $a->strings['Page not found.' ] = 'Page not found.' ; $a->strings['Permission denied'] = 'Permission denied'; $a->strings['Permission denied.'] = 'Permission denied.'; $a->strings['Nickname or Email address: '] = 'Nickname or Email address: '; +$a->strings['Welcome to '] = 'Welcome to '; $a->strings['Password: '] = 'Password: '; $a->strings['Login'] = 'Login'; $a->strings['Nickname/Email/OpenID: '] = 'Nickname/Email/OpenID: '; -- cgit v1.2.3 From e47a816a8fd50f5fcec51652ada223773ddad11f Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 23 Dec 2010 21:34:26 +0100 Subject: IT language --- view/it/cmnt_received_eml.tpl | 18 + view/it/contact_edit.tpl | 68 +++ view/it/cropbody.tpl | 57 +++ view/it/dfrn_req_confirm.tpl | 17 + view/it/directory_header.tpl | 14 + view/it/follow_notify_eml.tpl | 14 + view/it/friend_complete_eml.tpl | 23 + view/it/group_edit.tpl | 24 + view/it/group_new.tpl | 23 + view/it/head.tpl | 31 ++ view/it/htconfig.tpl | 64 +++ view/it/insecure_net.tpl | 6 + view/it/install_db.tpl | 40 ++ view/it/intro_complete_eml.tpl | 22 + view/it/intros-top.tpl | 7 + view/it/jot-header.tpl | 132 +++++ view/it/jot.tpl | 45 ++ view/it/like.tpl | 5 + view/it/logout.tpl | 6 + view/it/lostpass.tpl | 18 + view/it/lostpass_eml.tpl | 34 ++ view/it/mail_received_eml.tpl | 16 + view/it/msg-header.tpl | 100 ++++ view/it/netfriend.tpl | 14 + view/it/pagetypes.tpl | 25 + view/it/passchanged_eml.tpl | 20 + view/it/profile-hide-friends.tpl | 16 + view/it/profile-in-directory.tpl | 16 + view/it/profile-in-netdir.tpl | 16 + view/it/profile.php | 72 +++ view/it/profile_advanced.php | 226 +++++++++ view/it/profile_edit.tpl | 286 +++++++++++ view/it/profile_entry_default.tpl | 9 + view/it/profile_listing_header.tpl | 8 + view/it/profile_photo.tpl | 14 + view/it/profile_tabs.tpl | 7 + view/it/pwdreset.tpl | 16 + view/it/register-link.tpl | 1 + view/it/register_open_eml.tpl | 26 + view/it/register_verify_eml.tpl | 23 + view/it/request_notify_eml.tpl | 16 + view/it/settings.tpl | 165 ++++++ view/it/settings_nick_set.tpl | 9 + view/it/settings_nick_subdir.tpl | 7 + view/it/settings_nick_unset.tpl | 14 + view/it/strings.php | 995 +++++++++++++++++++++++++++++++++++++ view/it/wall_item_drop.tpl | 9 + view/it/wall_received_eml.tpl | 18 + view/it/wallwall_item.tpl | 36 ++ 49 files changed, 2848 insertions(+) create mode 100644 view/it/cmnt_received_eml.tpl create mode 100644 view/it/contact_edit.tpl create mode 100644 view/it/cropbody.tpl create mode 100644 view/it/dfrn_req_confirm.tpl create mode 100644 view/it/directory_header.tpl create mode 100644 view/it/follow_notify_eml.tpl create mode 100644 view/it/friend_complete_eml.tpl create mode 100644 view/it/group_edit.tpl create mode 100644 view/it/group_new.tpl create mode 100644 view/it/head.tpl create mode 100644 view/it/htconfig.tpl create mode 100644 view/it/insecure_net.tpl create mode 100644 view/it/install_db.tpl create mode 100644 view/it/intro_complete_eml.tpl create mode 100644 view/it/intros-top.tpl create mode 100644 view/it/jot-header.tpl create mode 100644 view/it/jot.tpl create mode 100644 view/it/like.tpl create mode 100644 view/it/logout.tpl create mode 100644 view/it/lostpass.tpl create mode 100644 view/it/lostpass_eml.tpl create mode 100644 view/it/mail_received_eml.tpl create mode 100644 view/it/msg-header.tpl create mode 100644 view/it/netfriend.tpl create mode 100644 view/it/pagetypes.tpl create mode 100644 view/it/passchanged_eml.tpl create mode 100644 view/it/profile-hide-friends.tpl create mode 100644 view/it/profile-in-directory.tpl create mode 100644 view/it/profile-in-netdir.tpl create mode 100644 view/it/profile.php create mode 100644 view/it/profile_advanced.php create mode 100644 view/it/profile_edit.tpl create mode 100644 view/it/profile_entry_default.tpl create mode 100644 view/it/profile_listing_header.tpl create mode 100644 view/it/profile_photo.tpl create mode 100644 view/it/profile_tabs.tpl create mode 100644 view/it/pwdreset.tpl create mode 100644 view/it/register-link.tpl create mode 100644 view/it/register_open_eml.tpl create mode 100644 view/it/register_verify_eml.tpl create mode 100644 view/it/request_notify_eml.tpl create mode 100644 view/it/settings.tpl create mode 100644 view/it/settings_nick_set.tpl create mode 100644 view/it/settings_nick_subdir.tpl create mode 100644 view/it/settings_nick_unset.tpl create mode 100644 view/it/strings.php create mode 100644 view/it/wall_item_drop.tpl create mode 100644 view/it/wall_received_eml.tpl create mode 100644 view/it/wallwall_item.tpl diff --git a/view/it/cmnt_received_eml.tpl b/view/it/cmnt_received_eml.tpl new file mode 100644 index 000000000..1991d29ae --- /dev/null +++ b/view/it/cmnt_received_eml.tpl @@ -0,0 +1,18 @@ + +Caro/a $username, + + '$from' ha commentato un elemeto/conversazione che stai seguendo. + +----- +$body +----- + +Accedi a $siteurl per verdere la conversazione completa: + +$display + +Grazie, + L'amministratore di $sitename + + + diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl new file mode 100644 index 000000000..cc4db7c15 --- /dev/null +++ b/view/it/contact_edit.tpl @@ -0,0 +1,68 @@ + +

$header

+ + + + + + +

+Libri, letteratura +

+ + + +

+ + + + +

+Televisione +

+ + + +

+ + + + +

+Film/danza/cultura/intrattenimento +

+ + + +

+ +

+ + +

+Amore/romanticismo +

+ + + +

+ + + + +

+Lavoro/impiego +

+ + + +

+ + + + +

+Scuola/educazione +

+ + + +

+ + + + +

+ +

+ + + + + diff --git a/view/it/profile_entry_default.tpl b/view/it/profile_entry_default.tpl new file mode 100644 index 000000000..8c9aedae8 --- /dev/null +++ b/view/it/profile_entry_default.tpl @@ -0,0 +1,9 @@ + +

$profile_name

diff --git a/view/it/profile_listing_header.tpl b/view/it/profile_listing_header.tpl new file mode 100644 index 000000000..995a577b3 --- /dev/null +++ b/view/it/profile_listing_header.tpl @@ -0,0 +1,8 @@ +

Profiles

+Cambia la foto del profilo +

+Crea un nuovo profilo +

+ diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl new file mode 100644 index 000000000..d941743d4 --- /dev/null +++ b/view/it/profile_photo.tpl @@ -0,0 +1,14 @@ +

Upload Profile Photo

+ + diff --git a/view/it/profile_tabs.tpl b/view/it/profile_tabs.tpl new file mode 100644 index 000000000..9c0f27d62 --- /dev/null +++ b/view/it/profile_tabs.tpl @@ -0,0 +1,7 @@ + +

+ Stato + Profilo + Foto +

diff --git a/view/it/pwdreset.tpl b/view/it/pwdreset.tpl new file mode 100644 index 000000000..004a7b16d --- /dev/null +++ b/view/it/pwdreset.tpl @@ -0,0 +1,16 @@ +

Resetta Password

+ +

+La tua password è stata resettata come richiesto. +

+La tua nuova password %egrave; +

+$newpass +

+Salva o copia la tua nuova password, e quindi clicca qui per accedere. +

+La tua password puo' essere cambiata dalla pagina 'Impostazioni0 dopo aver effettuato l'accesso. diff --git a/view/it/register-link.tpl b/view/it/register-link.tpl new file mode 100644 index 000000000..67fc37b22 --- /dev/null +++ b/view/it/register-link.tpl @@ -0,0 +1 @@ + Registrati diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl new file mode 100644 index 000000000..ae9ac89cd --- /dev/null +++ b/view/it/register_open_eml.tpl @@ -0,0 +1,26 @@ + +Caro/a $username, + Grazie per la tua registrazione a $sitename. Il tuo account è stato creato. +I dati di accesso sono i seguenti: + + +Sito: $siteurl +Nome: $email +Password: $password + +Puoi cambiare la tua password dall pagina "Impostazioni" del tuo account dopo +aver effettuato l'accesso. + +Prenditi un momento per rivedere le altre impostazioni dell'account su quella +pagina. +Di defaulti il tuo account è privato e nascosto (invisibile alle altre persone). +Puoi voler cambiarlo pubblicando il tuo profilo, così che appaia nell'elenco +e le altro persone possono trovarti. + + +Grazie e benventuo su $sitename. + +Sinceramente, + L'amministratore di $sitename + + diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl new file mode 100644 index 000000000..f1a34dbf4 --- /dev/null +++ b/view/it/register_verify_eml.tpl @@ -0,0 +1,23 @@ + +E' stata ricevuta la richiesta di registrazione di un nuovo utente su +$sitename che richiede la tua approvazione. + +I dettagli di login sono i seguenti: + +Nome Completo: $username +Sito: $siteurl +Nome: $email + + +Per approvare la richiesta, visita il link: + +$siteurl/regmod/allow/$hash + + +Per rifiutare la richiesta e rimuovere l'account, visita: + +$siteurl/regmod/deny/$hash + + +Grazie. + diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl new file mode 100644 index 000000000..50532cbd4 --- /dev/null +++ b/view/it/request_notify_eml.tpl @@ -0,0 +1,16 @@ + +Caro/a $myname, + +Hai appena ricevuto una richiesta di connessione su $sitename +da '$requestor'. + +Puoi visitare il suo profilo a $url. + +Accedi al tuo sito per vedere la completa presentazione e approvare o +ignorare/cancellare la richiesta. + +$siteurl + +Saluti, + + L'amministratore di $sitename diff --git a/view/it/settings.tpl b/view/it/settings.tpl new file mode 100644 index 000000000..f50a2151b --- /dev/null +++ b/view/it/settings.tpl @@ -0,0 +1,165 @@ +

Impostazioni account

+ +$nickname_block + + +

+ + +

Impostazioni base

+ +

+Nome Completo: + +

+ +

+Indirizzo Email: + +

+ + + +

+Il tuo fuso orario: +$zoneselect +

+ +

+Località di default per l'invio: + +

+ +

+Usa la località rilevata dal browser: + +

+ + + + +

+Tema: +$theme +

+ +

+ + +

Impostazioni si Sicurezza e Privacy

+ + + + +

+Numero massimo di richieste di amicizia per giorno + +

(per prevenire lo spam)

+ + + + +$profile_in_dir + +$profile_in_net_dir + + + +

+ + + + +

+ +

+ + + +

Impostazione Notifiche

+ + +

Invia una mail di notifica quando:

+Ricevi una presentazione + +

+Le tue presentazioni sono confermate + +

+Qualcuno scrive sulla bacheca del tuo profilo + +

+Qualcuno scrive un commento a un tuo messaggio + +

+Ricevi un messaggio privato + +

+ +

+ + +

Impostazioni Password

+ + +

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

+Nuova Password: + +

+ +

+Conferma: + +

+ +

+ $oidhtml +

+ + +

+ +

+ + +

Impostazioni Avanzante Pagina

+ +$pagetype + +

+ +

+ + +

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

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

+$subdir + +

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

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

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

diff --git a/view/it/settings_nick_unset.tpl b/view/it/settings_nick_unset.tpl new file mode 100644 index 000000000..903768b59 --- /dev/null +++ b/view/it/settings_nick_unset.tpl @@ -0,0 +1,14 @@ + +

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

+URL Nickname: + +

+ diff --git a/view/it/strings.php b/view/it/strings.php new file mode 100644 index 000000000..08eb5063c --- /dev/null +++ b/view/it/strings.php @@ -0,0 +1,995 @@ +strings['Not Found'] = 'Non Trovato'; +$a->strings['Page not found.' ] = 'Pagina non trovata.' ; +$a->strings['Permission denied'] = 'Permesso negato'; +$a->strings['Permission denied.'] = 'Permesso negato.'; +$a->strings['Nickname or Email address: '] = 'Soprannome o indirizzo Email: '; +$a->strings['Welcome to '] = 'Benvenuto a '; +$a->strings['Password: '] = 'Password: '; +$a->strings['Login'] = 'Accedi'; +$a->strings['Nickname/Email/OpenID: '] = 'Soprannome/Email/OpenID: '; +$a->strings["Password \x28if not OpenID\x29: "] = "Password \x28se non OpenID\x29: "; +$a->strings['Forgot your password?'] = 'Dimenticata la pssword?'; +$a->strings['Password Reset'] = 'Resetta password'; +$a->strings['prev'] = 'prec'; +$a->strings['first'] = 'primo'; +$a->strings['last'] = 'ultimo'; +$a->strings['next'] = 'succ'; +$a->strings[' likes this.'] = ' apprezza questo.'; +$a->strings[' doesn\'t like this.'] = ' non apprezza questo.'; +$a->strings['people'] = 'persone'; +$a->strings['like this.'] = 'apprezza questo.'; +$a->strings['don\'t like this.'] = 'non apprezza questo.'; +$a->strings['and'] = 'e'; +$a->strings[', and '] = ', e '; +$a->strings[' other people'] = ' altre persone'; +$a->strings[' like this.'] = ' apprezza questo.'; +$a->strings[' don\'t like this.'] = ' non apprezza questo.'; +$a->strings['No contacts'] = 'Nessun contatto'; +$a->strings['Contacts'] = 'Contatti'; +$a->strings['View Contacts'] = 'Guarda contatti'; +$a->strings['Search'] = 'Cerca'; +$a->strings['No profile'] = 'Nessun profilo'; +$a->strings['Connect'] = 'Connetti'; +$a->strings['Location:'] = 'Posizione:'; +$a->strings[', '] = ', '; +$a->strings['Gender:'] = 'Genere:'; +$a->strings['Status:'] = 'Stato:'; +$a->strings['Homepage:'] = 'Homepage:'; +$a->strings["Invite Friends"] = "Invita Amici"; +$a->strings['Connect/Follow [profile address]'] = 'Connetti/Segui [indirizzo profilo]'; +$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Esempio: bob@example.com, http://example.com/barbara'; +$a->strings['Follow'] = 'Segui'; +$a->strings['Could not access contact record.'] = 'Non si puo\' accedere al contatto.'; +$a->strings['Could not locate selected profile.'] = 'Non riesco a trovare il profilo selezionato.'; +$a->strings['Contact updated.'] = 'Contatto aggiornato.'; +$a->strings['Failed to update contact record.'] = 'Errore aggiornando il contatto.'; +$a->strings['Contact has been '] = 'Il contatto è stato '; +$a->strings['blocked'] = 'bloccato'; +$a->strings['unblocked'] = 'sbloccato'; +$a->strings['ignored'] = 'aggiunto ai contatti ignorati'; +$a->strings['unignored'] = 'rimosso dai contatti ignorati'; +$a->strings['stopped following'] = 'tolto dai seguiti'; +$a->strings['Contact has been removed.'] = 'Il contatto è stato rimosso.'; +$a->strings['Contact not found.'] = 'Contatto non trovato.'; +$a->strings['Mutual Friendship'] = 'Reciproca amicizia'; +$a->strings['is a fan of yours'] = 'è un tuo fan'; +$a->strings['you are a fan of'] = 'sei un fan di'; +$a->strings['Contact Editor'] = 'Editor dei Contatti'; +$a->strings['Visit $name\'s profile'] = 'Visita il profilo di $name'; +$a->strings['Block/Unblock contact'] = 'Blocca/Sblocca contatto'; +$a->strings['Ignore contact'] = 'Ingnora il contatto'; +$a->strings['Delete contact'] = 'Rimuovi contatto'; +$a->strings['Last updated: '] = 'Ultimo aggiornameto: '; +$a->strings['Update public posts: '] = 'Aggiorna messaggi pubblici: '; +$a->strings['Never'] = 'Mai'; +$a->strings['Unblock this contact'] = 'Sblocca questo contatto'; +$a->strings['Block this contact'] = 'Blocca questo contatto'; +$a->strings['Unignore this contact'] = 'Rimuovi dai contatti ingorati'; +$a->strings['Ignore this contact'] = 'Aggiungi ai contatti ignorati'; +$a->strings['Currently blocked'] = 'Bloccato'; +$a->strings['Currently ignored'] = 'Ignorato'; +$a->strings['Show Blocked Connections'] = 'Mostra connessioni bloccate'; +$a->strings['Hide Blocked Connections'] = 'Nascondi connessioni bloccate'; +$a->strings['Finding: '] = 'Cerco: '; +$a->strings['Find'] = 'Trova'; +$a->strings['Visit '] = 'Visita '; +$a->strings['\'s profile'] = 'profilo'; +$a->strings['Edit contact'] = 'Modifca contatto'; +$a->strings['Profile not found.'] = 'Profilo non trovato.'; +$a->strings['Response from remote site was not understood.'] = 'La risposta dal sito remota non è stata capita.'; +$a->strings['Unexpected response from remote site: '] = 'Risposta dal sito remoto inaspettata: '; +$a->strings["Confirmation completed successfully."] = "Conferma completata con successo."; +$a->strings['Remote site reported: '] = 'Il sito remoto riporsta: '; +$a->strings["Temporary failure. Please wait and try again."] = "Errore temporaneo. Attendi e riprova."; +$a->strings["Introduction failed or was revoked."] = "La presentazione è fallita o è stata revocata."; +$a->strings['Unable to set contact photo.'] = 'Impossibile impostare la foto del contatto.'; +$a->strings['No user record found for '] = 'Nessun utente trovato per '; +$a->strings['Our site encryption key is apparently messed up.'] = 'La nostra chiave di criptazione del sito e\' apparentemente incasinata.'; +$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'E\' stato fornito un indirizzo vuoto o non possiamo decriptare l\'indirizzo.'; +$a->strings['Contact record was not found for you on our site.'] = 'Il contatto non è stato trovato sul nostro sito.'; +$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'L\'ID fornito dal tuo sistema e\' duplicato sul nostro sistema. Dovrebbe funzionare se provi ancora.'; +$a->strings['Unable to set your contact credentials on our system.'] = 'Impossibile impostare le credenziali del tuo contatto sul nostro sistema.'; +$a->strings['Unable to update your contact profile details on our system'] = 'Impossibile aggiornare i dettagli del tuo contatto sul nostro sistema'; +$a->strings["Connection accepted at "] = "Connessione accettata alle "; +$a->strings['Administrator'] = 'Amministratore'; +$a->strings['New mail received at '] = 'Nuova mail ricevuta alle '; +$a->strings[' commented on an item at '] = ' commentato un elemento alle '; +$a->strings[" commented on an item at "] = " commentato un elemento alle "; +$a->strings[' welcomes '] = ' accoglie '; +$a->strings["This introduction has already been accepted."] = "Questa presentazione è già stata accettata."; +$a->strings['Profile location is not valid or does not contain profile information.'] = 'La posizione del profilo non è valida o non contiene informazioni di profilo.'; +$a->strings['Warning: profile location has no identifiable owner name.'] = 'Attenzione: la posizione del profilo non ha un identificabile proprietario'; +$a->strings['Warning: profile location has no profile photo.'] = 'Attenzione: la posizione del profilo non ha una foto.'; +$a->strings[' required parameter'] = ' parametro richiesto'; +$a->strings[" was "] = " era "; +$a->strings["s were "] = " dove "; +$a->strings["not found at the given location."] = "non trovato alla posizione data."; +$a->strings["Introduction complete."] = "Presentazione completa."; +$a->strings['Unrecoverable protocol error.'] = 'Errore di protocollo non recuperabile.'; +$a->strings['Profile unavailable.'] = 'Profilo non disponibile.'; +$a->strings["Invalid locator"] = "Invalid locator"; +$a->strings["Unable to resolve your name at the provided location."] = "Impossibile risolvere il tuo nome nella posizione indicata."; +$a->strings['You have already introduced yourself here.'] = 'Ti sei già presentato qui.'; +$a->strings['Apparently you are already friends with .'] = 'Apparentemente sei già amico con .'; +$a->strings['Invalid profile URL.'] = 'Indirizzo profilo invalido.'; +$a->strings['Disallowed profile URL.'] = 'Indirizzo profilo non permesso.'; +$a->strings['Your introduction has been sent.'] = 'La tua presentazione è stata inviata.'; +$a->strings["Please login to confirm introduction."] = "Accedi per confermare la presentazione."; +$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Accesso con identà incorretta. Accedi a questo profilo."; +$a->strings['[Name Withheld]'] = '[Nome Nascosto]'; +$a->strings['Friend/Connection Request'] = 'Richieste di Amicizia/Connessione'; +$a->strings['Please answer the following:'] = 'Rispondi al seguente:'; +$a->strings['Does $name know you?'] = '$name ti conosce?'; +$a->strings['Yes'] = 'Si'; +$a->strings['No'] = 'No'; +$a->strings['Add a personal note:'] = 'Aggiungi una nota personale:'; +$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Inserisci l\'indirizzo del tue profilo da uno dei seguenti supportati seocial network:'; +$a->strings['Friendika'] = 'Friendika'; +$a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web'; +$a->strings["Private \x28secure\x29 network"] = "Network \x28sicuro\x29 privato"; +$a->strings["Public \x28insecure\x29 network"] = "Network \x28insicuro\x29 pubblico"; +$a->strings['Your profile address:'] = 'L\'indirizzo del tuo profilo:'; +$a->strings['Submit Request'] = 'Invia richiesta'; +$a->strings['Cancel'] = 'Annulla'; +$a->strings['Global Directory'] = 'Elenco Globale'; +$a->strings['Item not found.'] = 'Elemento non trovato.'; +$a->strings['Private Message'] = 'Messaggio privato'; +$a->strings['This is you'] = 'Questo sei tu'; +$a->strings['Item has been removed.'] = 'L\'elemento è stato rimosso.'; +$a->strings['The profile address specified does not provide adequate information.'] = 'L\'indirizzo del profilo specificato non fornisce adeguate informazioni'; +$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Profilo limitato. Questa persona non sara\' in grado di ricevere nofiche dirette/personali da te.'; +$a->strings['Unable to retrieve contact information.'] = 'Impossibile recuperare informazioni sul contatto.'; +$a->strings['following'] = 'segue'; +$a->strings['Group created.'] = 'Gruppo creato.'; +$a->strings['Could not create group.'] = 'Impossibile creare il gruppo.'; +$a->strings['Group not found.'] = 'Gruppo non trovato.'; +$a->strings['Group name changed.'] = 'Il nome del gruppo e\' cambiato.'; +$a->strings['Membership list updated.'] = 'Lista adesioni aggiornata.'; +$a->strings['Group removed.'] = 'Gruppo rimosso.'; +$a->strings['Unable to remove group.'] = 'Impossibile rimuovere il gruppo.'; +$a->strings['Delete'] = 'Cancella'; +$a->strings['Could not create/connect to database.'] = 'Impossibile creare/collegarsi al database.'; +$a->strings['Connected to database.'] = 'Collegato al database.'; +$a->strings['Database import succeeded.'] = 'Importazione database completata.'; +$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANTE: Devi impostare manualmente un operazione pianificata per il poller'; +$a->strings['Please see the file INSTALL.'] = 'Guarda il file INSTALL.'; +$a->strings['Database import failed.'] = 'Importazione database fallita.'; +$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Potresti dover importare il file "database.sql" manualmente con phpmyadmin o mysql'; +$a->strings['Welcome to Friendika.'] = 'Benvenuto su Friendika.'; +$a->strings['Submit'] = 'Invia'; +$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Non riesco a trovare una versione da riga di comando di PHP nel PATH del server web'; +$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'E\' richiesto. Aggiorna il file .htconfig.php di conseguenza.'; +$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'La versione da riga di comando di PHP nel sistema non ha abilitato "register_argc_argv".'; +$a->strings['This is required for message delivery to work.'] = 'Ció è richiesto per far funzionare la consegna dei messaggi.'; +$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Errore: la funzione "openssl_pkey_new" in questo sistema non è in grado di generare le chiavi di criptazione'; +$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Errore: il modulo mod-rewrite di Apache &egreve; richiesto ma non installato'; +$a->strings['Error: libCURL PHP module required but not installed.'] = 'Errore: il modulo libCURL di PHP è richiesto ma non installato.'; +$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato.'; +$a->strings['Error: openssl PHP module required but not installed.'] = 'Errore: il modulo openssl di PHP è richiesto ma non installato.'; +$a->strings['Error: mysqli PHP module required but not installed.'] = 'Errore: il modulo mysqli di PHP è richiesto ma non installato'; +$a->strings['Please see the file "INSTALL".'] = 'Guarda il file "INSTALL".'; +$a->strings['The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.'] = 'L\'installazione web deve poter creare un file chiamato ".htconfig.php" nella cartella principale del tuo web server ma non è in grado di farlo.'; +$a->strings['This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'] = 'Ció è dovuto spesso a impostazioni di permessi, dato che il web server puo\' scrivere il file nella tua cartella, anche se tu puoi.'; +$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Controlla la documentazione del tuo sito o con il personale di suporto se la situazione puo\' essere corretta.'; +$a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.'] = 'Altrimenti dovrai procedere con l\'installazione manuale. Guarda il file "INSTALL" per istuzioni'; +$a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'Il file di configurazione del database ".htconfig.php" non puo\' essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.'; +$a->strings['Errors encountered creating database tables.'] = 'Errori creando le tabelle nel database.'; +$a->strings[' : '] = ' : '; +$a->strings['Not a valid email address.'] = 'Indirizzo email invaildo.'; +$a->strings['Please join my network on '] = 'Unisciti alla mia rete su '; +$a->strings['Message delivery failed.'] = 'Consegna del messaggio fallita.'; +$a->strings[' messages sent.'] = ' messaggio inviato.'; +$a->strings['Send invitations'] = 'Invia inviti'; +$a->strings['Enter email addresses, one per line:'] = 'Inserisci gli indirizzi email, uno per riga:'; +$a->strings['Your message:'] = 'Il tuo messaggio:'; +$a->strings['Please join my social network on '] = 'Unisciti al mio social network su '; +$a->strings["\r\n"] = "\r\n"; +$a->strings['To accept this invitation, please visit:'] = 'Per accettare questo invito visita:'; +$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Una volta registrato, connettiti con me sul mio profilo a:'; +$a->strings['Unable to locate original post.'] = 'Impossibile trovare il messaggio originale.'; +$a->strings['Empty post discarded.'] = 'Messaggio vuoto scartato.'; +$a->strings[" commented on your item at "] = " ha commentato il tuo elemento alle "; +$a->strings[" posted on your profile wall at "] = " ha inviato un messaggio sulla tua bachecha alle "; +$a->strings['Facebook status update failed.'] = 'Aggiornamento stato Facebook fallito.'; +$a->strings['photo'] = 'foto'; +$a->strings['status'] = 'stato'; +$a->strings['likes'] = 'apprezza'; +$a->strings['doesn\'t like'] = 'non apprezza'; +$a->strings['\'s'] = '\'s'; +$a->strings['Remote privacy information not available.'] = 'Informazioni remote sulla privacy non disponibili.'; +$a->strings['Visible to:'] = 'Visibile a:'; +$a->strings['Password reset requested at '] = 'Resetta password richiesta alle '; +$a->strings['No recipient selected.'] = 'Nessun destinatario selezionato.'; +$a->strings['[no subject]'] = '[nessun oggetto]'; +$a->strings['Unable to locate contact information.'] = 'Impossibile trovare le informazioni del contatto.'; +$a->strings['Message sent.'] = 'Messaggio inviato.'; +$a->strings['Message could not be sent.'] = 'Il messaggio non puo\' essere inviato.'; +$a->strings['Messages'] = 'Messaggi'; +$a->strings['Inbox'] = 'In arrivo'; +$a->strings['Outbox'] = 'Inviati'; +$a->strings['New Message'] = 'Nuovo messaggio'; +$a->strings['Message deleted.'] = 'Messaggio cancellato.'; +$a->strings['Conversation removed.'] = 'Conversazione rimossa.'; +$a->strings['Send Private Message'] = 'Invia messaggio privato'; +$a->strings['To:'] = 'A:'; +$a->strings['Subject:'] = 'Oggetto:'; +$a->strings['Upload photo'] = 'Carica foto'; +$a->strings['Insert web link'] = 'Inserisci link'; +$a->strings['Please wait'] = 'Attendi'; +$a->strings['No messages.'] = 'Nessun messaggio.'; +$a->strings['Delete conversation'] = 'Cancella conversazione'; +$a->strings['Message not available.'] = 'Messaggio non disponibile.'; +$a->strings['Delete message'] = 'Cancella messaggio'; +$a->strings['Send Reply'] = 'Invia risposta'; +$a->strings['No such group'] = 'Nessun gruppo'; +$a->strings['Group: '] = 'Gruppo: '; +$a->strings['Invalid request identifier.'] = 'Identificativo richiesta invalido.'; +$a->strings['Discard'] = 'Scarta'; +$a->strings['Ignore'] = 'Ignora'; +$a->strings['Show Ignored Requests'] = 'Mostra richieste ignorate'; +$a->strings['Hide Ignored Requests'] = 'Nascondi richieste ignorate'; +$a->strings['Claims to be known to you: '] = 'Dice di conoscerti: '; +$a->strings['yes'] = 'si'; +$a->strings['no'] = 'no'; +$a->strings['Notification type: '] = 'Tipo di notifica: '; +$a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione'; +$a->strings['New Follower'] = 'Nuovo Seguace'; +$a->strings['Approve'] = 'Approva'; +$a->strings['No notifications.'] = 'Nessuna notifica.'; +$a->strings['Login failed.'] = 'Accesso fallito.'; +$a->strings["Welcome back "] = "Bentornato "; +$a->strings['Photo Albums'] = 'Album Foto'; +$a->strings['Contact Photos'] = 'Foto contatti'; +$a->strings['Contact information unavailable'] = 'Informazione sul contatto non disponibile'; +$a->strings['Profile Photos'] = 'Foto del profilo'; +$a->strings['Album not found.'] = 'Album non trovato.'; +$a->strings['Delete Album'] = 'Elimina album'; +$a->strings['Delete Photo'] = 'Elimina foto'; +$a->strings['was tagged in a'] = 'è stato taggato in'; +$a->strings['by'] = 'da'; +$a->strings['Image exceeds size limit of '] = 'L\'immagine supera il limite di dimensione di '; +$a->strings['Unable to process image.'] = 'Impossibile elaborare l\'immagine.'; +$a->strings['Image upload failed.'] = 'Caricamento immagine fallito.'; +$a->strings['No photos selected'] = 'Nessuna foto selezionata'; +$a->strings['Upload Photos'] = 'Carica foto'; +$a->strings['New album name: '] = 'Nome nuovo album: '; +$a->strings['or existing album name: '] = 'o nome di un album esistente: '; +$a->strings['Select files to upload: '] = 'Seleziona i file da caricare: '; +$a->strings['Permissions'] = 'Permessi'; +$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Usa il seguente controllo solo se il il caricatore Java (qui sopra) non parte.'; +$a->strings['Edit Album'] = 'Modifica album'; +$a->strings['View Photo'] = 'Vedi foto'; +$a->strings['Photo not available'] = 'Foto non disponibile'; +$a->strings['Edit photo'] = 'Modifica foto'; +$a->strings['View Full Size'] = 'Vedi dimensione intera'; +$a->strings['Tags: '] = 'Tag: '; +$a->strings['[Remove any tag]'] = '[Rimuovi tutti i tag]'; +$a->strings['Caption'] = 'Didascalia'; +$a->strings['Add a Tag'] = 'Aggiungi un tag'; +$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'; +$a->strings['Recent Photos'] = 'Foto recenti'; +$a->strings['Upload New Photos'] = 'Carica nuova foto'; +$a->strings['View Album'] = 'Vedi album'; +$a->strings['Image uploaded but image cropping failed.'] = 'Immagine caricata ma il ritaglio è fallito.'; +$a->strings['Image size reduction [175] failed.'] = 'Riduzione dimensioni immagine [175] fallito.'; +$a->strings['Image size reduction [80] failed.'] = 'Riduzione dimensioni immagine [80] fallito.'; +$a->strings['Image size reduction [48] failed.'] = 'Riduzione dimensioni immagine [48] fallito.'; +$a->strings['Unable to process image'] = 'Impossibile elaborare l\'immagine'; +$a->strings['Image uploaded successfully.'] = 'Immagine caricata con successo.'; +$a->strings['Image size reduction [640] failed.'] = 'Riduzione dimensioni immagine [640] fallito.'; +$a->strings['Profile Name is required.'] = 'Il Nome Profilo è richiesto .'; +$a->strings['Profile updated.'] = 'Profilo aggiornato.'; +$a->strings['Profile deleted.'] = 'Profilo elminato.'; +$a->strings['Profile-'] = 'Profilo-'; +$a->strings['New profile created.'] = 'Nuovo profilo creato.'; +$a->strings['Profile unavailable to clone.'] = 'Impossibile duplicare il plrofilo.'; +$a->strings['This is your public profile.
It may be visible to anybody using the internet.'] = 'Questo è il tuo profilo publico.
Potrebbe essere visto da chiunque attraverso internet.'; +$a->strings['Age: '] = 'Età: '; +$a->strings['Please enter the required information.'] = 'Inserisci le informazioni richieste.'; +$a->strings['Please use a shorter name.'] = 'Usa un nome più corto.'; +$a->strings['Name too short.'] = 'Il Nome è troppo corto.'; +$a->strings["That doesn\'t appear to be your full \x28First Last\x29 name."] = "Questo non sembra essere il tuo Nome Completo \x28Nome Cognome\x29."; +$a->strings['Your email domain is not among those allowed on this site.'] = 'Il dominio della tua email non è tra quelli autorizzati su questo sito.'; +$a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.'] = 'Il tuo "soprannome" puo\' contenere solo "a-z", "0-9", "-", e "_", e deve cominciare con una lettera.'; +$a->strings['Nickname is already registered. Please choose another.'] = 'Soprannome già registrato. Scegline un\'altro.'; +$a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'ERRORE GRAVE: Generazione delle chiavi di sicurezza fallito.'; +$a->strings['An error occurred during registration. Please try again.'] = 'Si è verificato un errore durante la registrazione. Prova ancora.'; +$a->strings['An error occurred creating your default profile. Please try again.'] = 'Si è verificato un errore creando il tuo profilo. Prova ancora.'; +$a->strings['Registration details for '] = 'Dettagli registrazione per '; +$a->strings['Registration successful. Please check your email for further instructions.'] = 'Registrazione completata. Controlla la tua mail per ulteriori informazioni.'; +$a->strings['Failed to send email message. Here is the message that failed.'] = 'Errore inviando il messaggio email. Questo è il messaggio non inviato.'; +$a->strings['Your registration can not be processed.'] = 'La tua registrazione non puo\' essere elaborata.'; +$a->strings['Registration request at '] = 'Registrazione richiesta il '; +$a->strings['Your registration is pending approval by the site owner.'] = 'La tua richiesta è in attesa di approvazione da parte del prorietario del sito.'; +$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puoi \x28opzionalmento\x29 riempire questa maschera via OpenID inserendo il tuo OpenID e cliccando 'Registra'."; +$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Se non hai famigliarità con OpenID, lascia quel campo in bianco e riempi il resto della maschera.'; +$a->strings["Your OpenID \x28optional\x29: "] = "Il tuo OpenID \x28opzionale\x29: "; +$a->strings['Registration'] = 'Registrazione'; +$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Il tuo Nome Completo ' . "\x28" . 'p.e. Mario Rossi' . "\x29" . ': '; +$a->strings['Your Email Address: '] = 'Il tuo Indirizzo Email: '; +$a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'] = 'Scegli un soprannome per il profilo. Deve cominciare con una lettera. L\'identificativo globale del tuo profilo sarà \'soprannome@$sitename\'.'; +$a->strings['Choose a nickname: '] = 'Scegli un soprannome: '; +$a->strings['Register'] = 'Regitrati'; +$a->strings['Please login.'] = 'Accedi.'; +$a->strings['Registration revoked for '] = 'Registrazione revocata per '; +$a->strings['Account approved.'] = 'Account approvato.'; +$a->strings['View in context'] = 'Vedi nel contesto'; +$a->strings['Passwords do not match. Password unchanged.'] = 'Le password non corrispondono. Passoword non cambiata.'; +$a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Password vuote non sono consentite. Password non cambiata.'; +$a->strings['Password changed.'] = 'Password cambiata.'; +$a->strings['Password update failed. Please try again.'] = 'Aggiornamento password fallito. Prova ancora.'; +$a->strings[' Please use a shorter name.'] = ' Usa un nome più corto.'; +$a->strings[' Name too short.'] = ' Nome troppo corto.'; +$a->strings[' Not valid email.'] = ' Email non valida.'; +$a->strings['Settings updated.'] = 'Impostazioni aggiornate.'; +$a->strings['OpenID: '] = 'OpenID: '; +$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Opzionale\x29 Permetti a questo OpenID di accedere a questo account."; +$a->strings['Profile is not published.'] = 'Il profilo non è pubblicato.'; +$a->strings['Default Post Permissions'] = 'Permessi di default per i messaggi'; +$a->strings['Tag removed'] = 'TAg rimosso'; +$a->strings['Remove Item Tag'] = 'Rimuovi tag dall\'elemento'; +$a->strings['Select a tag to remove: '] = 'Seleziona un tag da rimuovere: '; +$a->strings['Remove'] = 'Rimuovi'; +$a->strings['No contacts.'] = 'Nessuno contatto.'; +$a->strings['Wall Photos'] = 'Foto bachecha'; +$a->strings['Visible To:'] = 'Visibile a:'; +$a->strings['Groups'] = 'Gruppi'; +$a->strings['Except For:'] = 'Eccetto per:'; +$a->strings['Logged out.'] = 'Sei uscito.'; +$a->strings['Unknown | Not categorised'] = 'Sconosciuto | non categorizzato'; +$a->strings['Block immediately'] = 'Blocca immediatamente'; +$a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer'; +$a->strings['Known to me, but no opinion'] = 'Lo conosco, ma non ho oppiniioni'; +$a->strings['OK, probably harmless'] = 'OK, probabilmente innocuo'; +$a->strings['Reputable, has my trust'] = 'Rispettabile, ha la mia fiducia'; +$a->strings['Frequently'] = 'Frequentemente'; +$a->strings['Hourly'] = 'Ogni ora'; +$a->strings['Twice daily'] = 'Due volte al dì'; +$a->strings['Daily'] = 'Giornalmente'; +$a->strings['Weekly'] = 'Settimanalmente'; +$a->strings['Monthly'] = 'Mensilmente'; +$a->strings['Miscellaneous'] = 'Varie'; +$a->strings['less than a second ago'] = 'meno di un secondo fa'; +$a->strings['year'] = 'anno'; +$a->strings['years'] = 'anni'; +$a->strings['month'] = 'mese'; +$a->strings['months'] = 'mesi'; +$a->strings['week'] = 'settimana'; +$a->strings['weeks'] = 'settimane'; +$a->strings['day'] = 'giorno'; +$a->strings['days'] = 'giorni'; +$a->strings['hour'] = 'ora'; +$a->strings['hours'] = 'ore'; +$a->strings['minute'] = 'minuto'; +$a->strings['minutes'] = 'minuti'; +$a->strings['second'] = 'secondo'; +$a->strings['seconds'] = 'secondi'; +$a->strings[' ago'] = ' fa'; +$a->strings['Create a new group'] = 'Crea un nuovo gruppo'; +$a->strings['Everybody'] = 'Tutti'; +$a->strings['Logout'] = 'Esci'; +$a->strings['Home'] = 'Home'; +$a->strings['Directory'] = 'Elenco'; +$a->strings['Network'] = 'Rete'; +$a->strings['Notifications'] = 'Notifiche'; +$a->strings['Settings'] = 'Impostazioni'; +$a->strings['Profiles'] = 'Profili'; +$a->strings['Male'] = 'Maschio'; +$a->strings['Female'] = 'Femmina'; +$a->strings['Currently Male'] = 'Al momento maschio'; +$a->strings['Currently Female'] = 'Al momento femmina'; +$a->strings['Mostly Male'] = 'Prevalentemente maschio'; +$a->strings['Mostly Female'] = 'Prevalentemente femmina'; +$a->strings['Transgender'] = 'Transgenere'; +$a->strings['Intersex'] = 'Bisessuale'; +$a->strings['Transsexual'] = 'Transsessuale'; +$a->strings['Hermaphrodite'] = 'Ermafrodito'; +$a->strings['Neuter'] = 'Neutro'; +$a->strings['Non-specific'] = 'Non-specifico'; +$a->strings['Other'] = 'Altro'; +$a->strings['Undecided'] = 'Indeciso'; +$a->strings['Males'] = 'Maschi'; +$a->strings['Females'] = 'Femmine'; +$a->strings['Gay'] = 'Gay'; +$a->strings['Lesbian'] = 'Lesbica'; +$a->strings['No Preference'] = 'Nessuna preferenza'; +$a->strings['Bisexual'] = 'Bisessuale'; +$a->strings['Autosexual'] = 'Autosessuale'; +$a->strings['Abstinent'] = 'Astinente'; +$a->strings['Virgin'] = 'Vergine'; +$a->strings['Deviant'] = 'Deviato'; +$a->strings['Fetish'] = 'Fetish'; +$a->strings['Oodles'] = 'Un sacco'; +$a->strings['Nonsexual'] = 'Asessuato'; +$a->strings['Single'] = 'Single'; +$a->strings['Lonely'] = 'Solitario'; +$a->strings['Available'] = 'Disoponibile'; +$a->strings['Unavailable'] = 'Non disponibile'; +$a->strings['Dating'] = 'Incontro'; +$a->strings['Unfaithful'] = 'Infedele'; +$a->strings['Sex Addict'] = 'Sesso-dipendente'; +$a->strings['Friends'] = 'Amici'; +$a->strings['Friends/Benefits'] = 'Amici con benefici'; +$a->strings['Casual'] = 'Casual'; +$a->strings['Engaged'] = 'Impegnato'; +$a->strings['Married'] = 'Sposato'; +$a->strings['Partners'] = 'Partners'; +$a->strings['Cohabiting'] = 'Coinquilino'; +$a->strings['Happy'] = 'Felice'; +$a->strings['Not Looking'] = 'Non in cerca'; +$a->strings['Swinger'] = 'Scambista'; +$a->strings['Betrayed'] = 'Tradito'; +$a->strings['Separated'] = 'Separato'; +$a->strings['Unstable'] = 'Instabile'; +$a->strings['Divorced'] = 'Divorziato'; +$a->strings['Widowed'] = 'Vedovo'; +$a->strings['Uncertain'] = 'Incerto'; +$a->strings['Complicated'] = 'Complicato'; +$a->strings['Don\'t care'] = 'Non interessa'; +$a->strings['Ask me'] = 'Chiedimelo'; +$a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; +$a->strings['Africa/Accra'] = 'Africa/Accra'; +$a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; +$a->strings['Africa/Algiers'] = 'Africa/Algiers'; +$a->strings['Africa/Asmara'] = 'Africa/Asmara'; +$a->strings['Africa/Asmera'] = 'Africa/Asmera'; +$a->strings['Africa/Bamako'] = 'Africa/Bamako'; +$a->strings['Africa/Bangui'] = 'Africa/Bangui'; +$a->strings['Africa/Banjul'] = 'Africa/Banjul'; +$a->strings['Africa/Bissau'] = 'Africa/Bissau'; +$a->strings['Africa/Blantyre'] = 'Africa/Blantyre'; +$a->strings['Africa/Brazzaville'] = 'Africa/Brazzaville'; +$a->strings['Africa/Bujumbura'] = 'Africa/Bujumbura'; +$a->strings['Africa/Cairo'] = 'Africa/Cairo'; +$a->strings['Africa/Casablanca'] = 'Africa/Casablanca'; +$a->strings['Africa/Ceuta'] = 'Africa/Ceuta'; +$a->strings['Africa/Conakry'] = 'Africa/Conakry'; +$a->strings['Africa/Dakar'] = 'Africa/Dakar'; +$a->strings['Africa/Dar_es_Salaam'] = 'Africa/Dar_es_Salaam'; +$a->strings['Africa/Djibouti'] = 'Africa/Djibouti'; +$a->strings['Africa/Douala'] = 'Africa/Douala'; +$a->strings['Africa/El_Aaiun'] = 'Africa/El_Aaiun'; +$a->strings['Africa/Freetown'] = 'Africa/Freetown'; +$a->strings['Africa/Gaborone'] = 'Africa/Gaborone'; +$a->strings['Africa/Harare'] = 'Africa/Harare'; +$a->strings['Africa/Johannesburg'] = 'Africa/Johannesburg'; +$a->strings['Africa/Kampala'] = 'Africa/Kampala'; +$a->strings['Africa/Khartoum'] = 'Africa/Khartoum'; +$a->strings['Africa/Kigali'] = 'Africa/Kigali'; +$a->strings['Africa/Kinshasa'] = 'Africa/Kinshasa'; +$a->strings['Africa/Lagos'] = 'Africa/Lagos'; +$a->strings['Africa/Libreville'] = 'Africa/Libreville'; +$a->strings['Africa/Lome'] = 'Africa/Lome'; +$a->strings['Africa/Luanda'] = 'Africa/Luanda'; +$a->strings['Africa/Lubumbashi'] = 'Africa/Lubumbashi'; +$a->strings['Africa/Lusaka'] = 'Africa/Lusaka'; +$a->strings['Africa/Malabo'] = 'Africa/Malabo'; +$a->strings['Africa/Maputo'] = 'Africa/Maputo'; +$a->strings['Africa/Maseru'] = 'Africa/Maseru'; +$a->strings['Africa/Mbabane'] = 'Africa/Mbabane'; +$a->strings['Africa/Mogadishu'] = 'Africa/Mogadishu'; +$a->strings['Africa/Monrovia'] = 'Africa/Monrovia'; +$a->strings['Africa/Nairobi'] = 'Africa/Nairobi'; +$a->strings['Africa/Ndjamena'] = 'Africa/Ndjamena'; +$a->strings['Africa/Niamey'] = 'Africa/Niamey'; +$a->strings['Africa/Nouakchott'] = 'Africa/Nouakchott'; +$a->strings['Africa/Ouagadougou'] = 'Africa/Ouagadougou'; +$a->strings['Africa/Porto-Novo'] = 'Africa/Porto-Novo'; +$a->strings['Africa/Sao_Tome'] = 'Africa/Sao_Tome'; +$a->strings['Africa/Timbuktu'] = 'Africa/Timbuktu'; +$a->strings['Africa/Tripoli'] = 'Africa/Tripoli'; +$a->strings['Africa/Tunis'] = 'Africa/Tunis'; +$a->strings['Africa/Windhoek'] = 'Africa/Windhoek'; +$a->strings['America/Adak'] = 'America/Adak'; +$a->strings['America/Anchorage'] = 'America/Anchorage'; +$a->strings['America/Anguilla'] = 'America/Anguilla'; +$a->strings['America/Antigua'] = 'America/Antigua'; +$a->strings['America/Araguaina'] = 'America/Araguaina'; +$a->strings['America/Argentina/Buenos_Aires'] = 'America/Argentina/Buenos_Aires'; +$a->strings['America/Argentina/Catamarca'] = 'America/Argentina/Catamarca'; +$a->strings['America/Argentina/ComodRivadavia'] = 'America/Argentina/ComodRivadavia'; +$a->strings['America/Argentina/Cordoba'] = 'America/Argentina/Cordoba'; +$a->strings['America/Argentina/Jujuy'] = 'America/Argentina/Jujuy'; +$a->strings['America/Argentina/La_Rioja'] = 'America/Argentina/La_Rioja'; +$a->strings['America/Argentina/Mendoza'] = 'America/Argentina/Mendoza'; +$a->strings['America/Argentina/Rio_Gallegos'] = 'America/Argentina/Rio_Gallegos'; +$a->strings['America/Argentina/Salta'] = 'America/Argentina/Salta'; +$a->strings['America/Argentina/San_Juan'] = 'America/Argentina/San_Juan'; +$a->strings['America/Argentina/San_Luis'] = 'America/Argentina/San_Luis'; +$a->strings['America/Argentina/Tucuman'] = 'America/Argentina/Tucuman'; +$a->strings['America/Argentina/Ushuaia'] = 'America/Argentina/Ushuaia'; +$a->strings['America/Aruba'] = 'America/Aruba'; +$a->strings['America/Asuncion'] = 'America/Asuncion'; +$a->strings['America/Atikokan'] = 'America/Atikokan'; +$a->strings['America/Atka'] = 'America/Atka'; +$a->strings['America/Bahia'] = 'America/Bahia'; +$a->strings['America/Barbados'] = 'America/Barbados'; +$a->strings['America/Belem'] = 'America/Belem'; +$a->strings['America/Belize'] = 'America/Belize'; +$a->strings['America/Blanc-Sablon'] = 'America/Blanc-Sablon'; +$a->strings['America/Boa_Vista'] = 'America/Boa_Vista'; +$a->strings['America/Bogota'] = 'America/Bogota'; +$a->strings['America/Boise'] = 'America/Boise'; +$a->strings['America/Buenos_Aires'] = 'America/Buenos_Aires'; +$a->strings['America/Cambridge_Bay'] = 'America/Cambridge_Bay'; +$a->strings['America/Campo_Grande'] = 'America/Campo_Grande'; +$a->strings['America/Cancun'] = 'America/Cancun'; +$a->strings['America/Caracas'] = 'America/Caracas'; +$a->strings['America/Catamarca'] = 'America/Catamarca'; +$a->strings['America/Cayenne'] = 'America/Cayenne'; +$a->strings['America/Cayman'] = 'America/Cayman'; +$a->strings['America/Chicago'] = 'America/Chicago'; +$a->strings['America/Chihuahua'] = 'America/Chihuahua'; +$a->strings['America/Coral_Harbour'] = 'America/Coral_Harbour'; +$a->strings['America/Cordoba'] = 'America/Cordoba'; +$a->strings['America/Costa_Rica'] = 'America/Costa_Rica'; +$a->strings['America/Cuiaba'] = 'America/Cuiaba'; +$a->strings['America/Curacao'] = 'America/Curacao'; +$a->strings['America/Danmarkshavn'] = 'America/Danmarkshavn'; +$a->strings['America/Dawson'] = 'America/Dawson'; +$a->strings['America/Dawson_Creek'] = 'America/Dawson_Creek'; +$a->strings['America/Denver'] = 'America/Denver'; +$a->strings['America/Detroit'] = 'America/Detroit'; +$a->strings['America/Dominica'] = 'America/Dominica'; +$a->strings['America/Edmonton'] = 'America/Edmonton'; +$a->strings['America/Eirunepe'] = 'America/Eirunepe'; +$a->strings['America/El_Salvador'] = 'America/El_Salvador'; +$a->strings['America/Ensenada'] = 'America/Ensenada'; +$a->strings['America/Fort_Wayne'] = 'America/Fort_Wayne'; +$a->strings['America/Fortaleza'] = 'America/Fortaleza'; +$a->strings['America/Glace_Bay'] = 'America/Glace_Bay'; +$a->strings['America/Godthab'] = 'America/Godthab'; +$a->strings['America/Goose_Bay'] = 'America/Goose_Bay'; +$a->strings['America/Grand_Turk'] = 'America/Grand_Turk'; +$a->strings['America/Grenada'] = 'America/Grenada'; +$a->strings['America/Guadeloupe'] = 'America/Guadeloupe'; +$a->strings['America/Guatemala'] = 'America/Guatemala'; +$a->strings['America/Guayaquil'] = 'America/Guayaquil'; +$a->strings['America/Guyana'] = 'America/Guyana'; +$a->strings['America/Halifax'] = 'America/Halifax'; +$a->strings['America/Havana'] = 'America/Havana'; +$a->strings['America/Hermosillo'] = 'America/Hermosillo'; +$a->strings['America/Indiana/Indianapolis'] = 'America/Indiana/Indianapolis'; +$a->strings['America/Indiana/Knox'] = 'America/Indiana/Knox'; +$a->strings['America/Indiana/Marengo'] = 'America/Indiana/Marengo'; +$a->strings['America/Indiana/Petersburg'] = 'America/Indiana/Petersburg'; +$a->strings['America/Indiana/Tell_City'] = 'America/Indiana/Tell_City'; +$a->strings['America/Indiana/Vevay'] = 'America/Indiana/Vevay'; +$a->strings['America/Indiana/Vincennes'] = 'America/Indiana/Vincennes'; +$a->strings['America/Indiana/Winamac'] = 'America/Indiana/Winamac'; +$a->strings['America/Indianapolis'] = 'America/Indianapolis'; +$a->strings['America/Inuvik'] = 'America/Inuvik'; +$a->strings['America/Iqaluit'] = 'America/Iqaluit'; +$a->strings['America/Jamaica'] = 'America/Jamaica'; +$a->strings['America/Jujuy'] = 'America/Jujuy'; +$a->strings['America/Juneau'] = 'America/Juneau'; +$a->strings['America/Kentucky/Louisville'] = 'America/Kentucky/Louisville'; +$a->strings['America/Kentucky/Monticello'] = 'America/Kentucky/Monticello'; +$a->strings['America/Knox_IN'] = 'America/Knox_IN'; +$a->strings['America/La_Paz'] = 'America/La_Paz'; +$a->strings['America/Lima'] = 'America/Lima'; +$a->strings['America/Los_Angeles'] = 'America/Los_Angeles'; +$a->strings['America/Louisville'] = 'America/Louisville'; +$a->strings['America/Maceio'] = 'America/Maceio'; +$a->strings['America/Managua'] = 'America/Managua'; +$a->strings['America/Manaus'] = 'America/Manaus'; +$a->strings['America/Marigot'] = 'America/Marigot'; +$a->strings['America/Martinique'] = 'America/Martinique'; +$a->strings['America/Matamoros'] = 'America/Matamoros'; +$a->strings['America/Mazatlan'] = 'America/Mazatlan'; +$a->strings['America/Mendoza'] = 'America/Mendoza'; +$a->strings['America/Menominee'] = 'America/Menominee'; +$a->strings['America/Merida'] = 'America/Merida'; +$a->strings['America/Mexico_City'] = 'America/Mexico_City'; +$a->strings['America/Miquelon'] = 'America/Miquelon'; +$a->strings['America/Moncton'] = 'America/Moncton'; +$a->strings['America/Monterrey'] = 'America/Monterrey'; +$a->strings['America/Montevideo'] = 'America/Montevideo'; +$a->strings['America/Montreal'] = 'America/Montreal'; +$a->strings['America/Montserrat'] = 'America/Montserrat'; +$a->strings['America/Nassau'] = 'America/Nassau'; +$a->strings['America/New_York'] = 'America/New_York'; +$a->strings['America/Nipigon'] = 'America/Nipigon'; +$a->strings['America/Nome'] = 'America/Nome'; +$a->strings['America/Noronha'] = 'America/Noronha'; +$a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center'; +$a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem'; +$a->strings['America/Ojinaga'] = 'America/Ojinaga'; +$a->strings['America/Panama'] = 'America/Panama'; +$a->strings['America/Pangnirtung'] = 'America/Pangnirtung'; +$a->strings['America/Paramaribo'] = 'America/Paramaribo'; +$a->strings['America/Phoenix'] = 'America/Phoenix'; +$a->strings['America/Port-au-Prince'] = 'America/Port-au-Prince'; +$a->strings['America/Port_of_Spain'] = 'America/Port_of_Spain'; +$a->strings['America/Porto_Acre'] = 'America/Porto_Acre'; +$a->strings['America/Porto_Velho'] = 'America/Porto_Velho'; +$a->strings['America/Puerto_Rico'] = 'America/Puerto_Rico'; +$a->strings['America/Rainy_River'] = 'America/Rainy_River'; +$a->strings['America/Rankin_Inlet'] = 'America/Rankin_Inlet'; +$a->strings['America/Recife'] = 'America/Recife'; +$a->strings['America/Regina'] = 'America/Regina'; +$a->strings['America/Resolute'] = 'America/Resolute'; +$a->strings['America/Rio_Branco'] = 'America/Rio_Branco'; +$a->strings['America/Rosario'] = 'America/Rosario'; +$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel'; +$a->strings['America/Santarem'] = 'America/Santarem'; +$a->strings['America/Santiago'] = 'America/Santiago'; +$a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo'; +$a->strings['America/Sao_Paulo'] = 'America/Sao_Paulo'; +$a->strings['America/Scoresbysund'] = 'America/Scoresbysund'; +$a->strings['America/Shiprock'] = 'America/Shiprock'; +$a->strings['America/St_Barthelemy'] = 'America/St_Barthelemy'; +$a->strings['America/St_Johns'] = 'America/St_Johns'; +$a->strings['America/St_Kitts'] = 'America/St_Kitts'; +$a->strings['America/St_Lucia'] = 'America/St_Lucia'; +$a->strings['America/St_Thomas'] = 'America/St_Thomas'; +$a->strings['America/St_Vincent'] = 'America/St_Vincent'; +$a->strings['America/Swift_Current'] = 'America/Swift_Current'; +$a->strings['America/Tegucigalpa'] = 'America/Tegucigalpa'; +$a->strings['America/Thule'] = 'America/Thule'; +$a->strings['America/Thunder_Bay'] = 'America/Thunder_Bay'; +$a->strings['America/Tijuana'] = 'America/Tijuana'; +$a->strings['America/Toronto'] = 'America/Toronto'; +$a->strings['America/Tortola'] = 'America/Tortola'; +$a->strings['America/Vancouver'] = 'America/Vancouver'; +$a->strings['America/Virgin'] = 'America/Virgin'; +$a->strings['America/Whitehorse'] = 'America/Whitehorse'; +$a->strings['America/Winnipeg'] = 'America/Winnipeg'; +$a->strings['America/Yakutat'] = 'America/Yakutat'; +$a->strings['America/Yellowknife'] = 'America/Yellowknife'; +$a->strings['Antarctica/Casey'] = 'Antarctica/Casey'; +$a->strings['Antarctica/Davis'] = 'Antarctica/Davis'; +$a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville'; +$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie'; +$a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson'; +$a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo'; +$a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer'; +$a->strings['Antarctica/Rothera'] = 'Antarctica/Rothera'; +$a->strings['Antarctica/South_Pole'] = 'Antarctica/South_Pole'; +$a->strings['Antarctica/Syowa'] = 'Antarctica/Syowa'; +$a->strings['Antarctica/Vostok'] = 'Antarctica/Vostok'; +$a->strings['Arctic/Longyearbyen'] = 'Arctic/Longyearbyen'; +$a->strings['Asia/Aden'] = 'Asia/Aden'; +$a->strings['Asia/Almaty'] = 'Asia/Almaty'; +$a->strings['Asia/Amman'] = 'Asia/Amman'; +$a->strings['Asia/Anadyr'] = 'Asia/Anadyr'; +$a->strings['Asia/Aqtau'] = 'Asia/Aqtau'; +$a->strings['Asia/Aqtobe'] = 'Asia/Aqtobe'; +$a->strings['Asia/Ashgabat'] = 'Asia/Ashgabat'; +$a->strings['Asia/Ashkhabad'] = 'Asia/Ashkhabad'; +$a->strings['Asia/Baghdad'] = 'Asia/Baghdad'; +$a->strings['Asia/Bahrain'] = 'Asia/Bahrain'; +$a->strings['Asia/Baku'] = 'Asia/Baku'; +$a->strings['Asia/Bangkok'] = 'Asia/Bangkok'; +$a->strings['Asia/Beirut'] = 'Asia/Beirut'; +$a->strings['Asia/Bishkek'] = 'Asia/Bishkek'; +$a->strings['Asia/Brunei'] = 'Asia/Brunei'; +$a->strings['Asia/Calcutta'] = 'Asia/Calcutta'; +$a->strings['Asia/Choibalsan'] = 'Asia/Choibalsan'; +$a->strings['Asia/Chongqing'] = 'Asia/Chongqing'; +$a->strings['Asia/Chungking'] = 'Asia/Chungking'; +$a->strings['Asia/Colombo'] = 'Asia/Colombo'; +$a->strings['Asia/Dacca'] = 'Asia/Dacca'; +$a->strings['Asia/Damascus'] = 'Asia/Damascus'; +$a->strings['Asia/Dhaka'] = 'Asia/Dhaka'; +$a->strings['Asia/Dili'] = 'Asia/Dili'; +$a->strings['Asia/Dubai'] = 'Asia/Dubai'; +$a->strings['Asia/Dushanbe'] = 'Asia/Dushanbe'; +$a->strings['Asia/Gaza'] = 'Asia/Gaza'; +$a->strings['Asia/Harbin'] = 'Asia/Harbin'; +$a->strings['Asia/Ho_Chi_Minh'] = 'Asia/Ho_Chi_Minh'; +$a->strings['Asia/Hong_Kong'] = 'Asia/Hong_Kong'; +$a->strings['Asia/Hovd'] = 'Asia/Hovd'; +$a->strings['Asia/Irkutsk'] = 'Asia/Irkutsk'; +$a->strings['Asia/Istanbul'] = 'Asia/Istanbul'; +$a->strings['Asia/Jakarta'] = 'Asia/Jakarta'; +$a->strings['Asia/Jayapura'] = 'Asia/Jayapura'; +$a->strings['Asia/Jerusalem'] = 'Asia/Jerusalem'; +$a->strings['Asia/Kabul'] = 'Asia/Kabul'; +$a->strings['Asia/Kamchatka'] = 'Asia/Kamchatka'; +$a->strings['Asia/Karachi'] = 'Asia/Karachi'; +$a->strings['Asia/Kashgar'] = 'Asia/Kashgar'; +$a->strings['Asia/Kathmandu'] = 'Asia/Kathmandu'; +$a->strings['Asia/Katmandu'] = 'Asia/Katmandu'; +$a->strings['Asia/Kolkata'] = 'Asia/Kolkata'; +$a->strings['Asia/Krasnoyarsk'] = 'Asia/Krasnoyarsk'; +$a->strings['Asia/Kuala_Lumpur'] = 'Asia/Kuala_Lumpur'; +$a->strings['Asia/Kuching'] = 'Asia/Kuching'; +$a->strings['Asia/Kuwait'] = 'Asia/Kuwait'; +$a->strings['Asia/Macao'] = 'Asia/Macao'; +$a->strings['Asia/Macau'] = 'Asia/Macau'; +$a->strings['Asia/Magadan'] = 'Asia/Magadan'; +$a->strings['Asia/Makassar'] = 'Asia/Makassar'; +$a->strings['Asia/Manila'] = 'Asia/Manila'; +$a->strings['Asia/Muscat'] = 'Asia/Muscat'; +$a->strings['Asia/Nicosia'] = 'Asia/Nicosia'; +$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk'; +$a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk'; +$a->strings['Asia/Omsk'] = 'Asia/Omsk'; +$a->strings['Asia/Oral'] = 'Asia/Oral'; +$a->strings['Asia/Phnom_Penh'] = 'Asia/Phnom_Penh'; +$a->strings['Asia/Pontianak'] = 'Asia/Pontianak'; +$a->strings['Asia/Pyongyang'] = 'Asia/Pyongyang'; +$a->strings['Asia/Qatar'] = 'Asia/Qatar'; +$a->strings['Asia/Qyzylorda'] = 'Asia/Qyzylorda'; +$a->strings['Asia/Rangoon'] = 'Asia/Rangoon'; +$a->strings['Asia/Riyadh'] = 'Asia/Riyadh'; +$a->strings['Asia/Saigon'] = 'Asia/Saigon'; +$a->strings['Asia/Sakhalin'] = 'Asia/Sakhalin'; +$a->strings['Asia/Samarkand'] = 'Asia/Samarkand'; +$a->strings['Asia/Seoul'] = 'Asia/Seoul'; +$a->strings['Asia/Shanghai'] = 'Asia/Shanghai'; +$a->strings['Asia/Singapore'] = 'Asia/Singapore'; +$a->strings['Asia/Taipei'] = 'Asia/Taipei'; +$a->strings['Asia/Tashkent'] = 'Asia/Tashkent'; +$a->strings['Asia/Tbilisi'] = 'Asia/Tbilisi'; +$a->strings['Asia/Tehran'] = 'Asia/Tehran'; +$a->strings['Asia/Tel_Aviv'] = 'Asia/Tel_Aviv'; +$a->strings['Asia/Thimbu'] = 'Asia/Thimbu'; +$a->strings['Asia/Thimphu'] = 'Asia/Thimphu'; +$a->strings['Asia/Tokyo'] = 'Asia/Tokyo'; +$a->strings['Asia/Ujung_Pandang'] = 'Asia/Ujung_Pandang'; +$a->strings['Asia/Ulaanbaatar'] = 'Asia/Ulaanbaatar'; +$a->strings['Asia/Ulan_Bator'] = 'Asia/Ulan_Bator'; +$a->strings['Asia/Urumqi'] = 'Asia/Urumqi'; +$a->strings['Asia/Vientiane'] = 'Asia/Vientiane'; +$a->strings['Asia/Vladivostok'] = 'Asia/Vladivostok'; +$a->strings['Asia/Yakutsk'] = 'Asia/Yakutsk'; +$a->strings['Asia/Yekaterinburg'] = 'Asia/Yekaterinburg'; +$a->strings['Asia/Yerevan'] = 'Asia/Yerevan'; +$a->strings['Atlantic/Azores'] = 'Atlantic/Azores'; +$a->strings['Atlantic/Bermuda'] = 'Atlantic/Bermuda'; +$a->strings['Atlantic/Canary'] = 'Atlantic/Canary'; +$a->strings['Atlantic/Cape_Verde'] = 'Atlantic/Cape_Verde'; +$a->strings['Atlantic/Faeroe'] = 'Atlantic/Faeroe'; +$a->strings['Atlantic/Faroe'] = 'Atlantic/Faroe'; +$a->strings['Atlantic/Jan_Mayen'] = 'Atlantic/Jan_Mayen'; +$a->strings['Atlantic/Madeira'] = 'Atlantic/Madeira'; +$a->strings['Atlantic/Reykjavik'] = 'Atlantic/Reykjavik'; +$a->strings['Atlantic/South_Georgia'] = 'Atlantic/South_Georgia'; +$a->strings['Atlantic/St_Helena'] = 'Atlantic/St_Helena'; +$a->strings['Atlantic/Stanley'] = 'Atlantic/Stanley'; +$a->strings['Australia/ACT'] = 'Australia/ACT'; +$a->strings['Australia/Adelaide'] = 'Australia/Adelaide'; +$a->strings['Australia/Brisbane'] = 'Australia/Brisbane'; +$a->strings['Australia/Broken_Hill'] = 'Australia/Broken_Hill'; +$a->strings['Australia/Canberra'] = 'Australia/Canberra'; +$a->strings['Australia/Currie'] = 'Australia/Currie'; +$a->strings['Australia/Darwin'] = 'Australia/Darwin'; +$a->strings['Australia/Eucla'] = 'Australia/Eucla'; +$a->strings['Australia/Hobart'] = 'Australia/Hobart'; +$a->strings['Australia/LHI'] = 'Australia/LHI'; +$a->strings['Australia/Lindeman'] = 'Australia/Lindeman'; +$a->strings['Australia/Lord_Howe'] = 'Australia/Lord_Howe'; +$a->strings['Australia/Melbourne'] = 'Australia/Melbourne'; +$a->strings['Australia/North'] = 'Australia/North'; +$a->strings['Australia/NSW'] = 'Australia/NSW'; +$a->strings['Australia/Perth'] = 'Australia/Perth'; +$a->strings['Australia/Queensland'] = 'Australia/Queensland'; +$a->strings['Australia/South'] = 'Australia/South'; +$a->strings['Australia/Sydney'] = 'Australia/Sydney'; +$a->strings['Australia/Tasmania'] = 'Australia/Tasmania'; +$a->strings['Australia/Victoria'] = 'Australia/Victoria'; +$a->strings['Australia/West'] = 'Australia/West'; +$a->strings['Australia/Yancowinna'] = 'Australia/Yancowinna'; +$a->strings['Brazil/Acre'] = 'Brazil/Acre'; +$a->strings['Brazil/DeNoronha'] = 'Brazil/DeNoronha'; +$a->strings['Brazil/East'] = 'Brazil/East'; +$a->strings['Brazil/West'] = 'Brazil/West'; +$a->strings['Canada/Atlantic'] = 'Canada/Atlantic'; +$a->strings['Canada/Central'] = 'Canada/Central'; +$a->strings['Canada/East-Saskatchewan'] = 'Canada/East-Saskatchewan'; +$a->strings['Canada/Eastern'] = 'Canada/Eastern'; +$a->strings['Canada/Mountain'] = 'Canada/Mountain'; +$a->strings['Canada/Newfoundland'] = 'Canada/Newfoundland'; +$a->strings['Canada/Pacific'] = 'Canada/Pacific'; +$a->strings['Canada/Saskatchewan'] = 'Canada/Saskatchewan'; +$a->strings['Canada/Yukon'] = 'Canada/Yukon'; +$a->strings['CET'] = 'CET'; +$a->strings['Chile/Continental'] = 'Chile/Continental'; +$a->strings['Chile/EasterIsland'] = 'Chile/EasterIsland'; +$a->strings['CST6CDT'] = 'CST6CDT'; +$a->strings['Cuba'] = 'Cuba'; +$a->strings['EET'] = 'EET'; +$a->strings['Egypt'] = 'Egypt'; +$a->strings['Eire'] = 'Eire'; +$a->strings['EST'] = 'EST'; +$a->strings['EST5EDT'] = 'EST5EDT'; +$a->strings['Etc/GMT'] = 'Etc/GMT'; +$a->strings['Etc/GMT+0'] = 'Etc/GMT+0'; +$a->strings['Etc/GMT+1'] = 'Etc/GMT+1'; +$a->strings['Etc/GMT+10'] = 'Etc/GMT+10'; +$a->strings['Etc/GMT+11'] = 'Etc/GMT+11'; +$a->strings['Etc/GMT+12'] = 'Etc/GMT+12'; +$a->strings['Etc/GMT+2'] = 'Etc/GMT+2'; +$a->strings['Etc/GMT+3'] = 'Etc/GMT+3'; +$a->strings['Etc/GMT+4'] = 'Etc/GMT+4'; +$a->strings['Etc/GMT+5'] = 'Etc/GMT+5'; +$a->strings['Etc/GMT+6'] = 'Etc/GMT+6'; +$a->strings['Etc/GMT+7'] = 'Etc/GMT+7'; +$a->strings['Etc/GMT+8'] = 'Etc/GMT+8'; +$a->strings['Etc/GMT+9'] = 'Etc/GMT+9'; +$a->strings['Etc/GMT-0'] = 'Etc/GMT-0'; +$a->strings['Etc/GMT-1'] = 'Etc/GMT-1'; +$a->strings['Etc/GMT-10'] = 'Etc/GMT-10'; +$a->strings['Etc/GMT-11'] = 'Etc/GMT-11'; +$a->strings['Etc/GMT-12'] = 'Etc/GMT-12'; +$a->strings['Etc/GMT-13'] = 'Etc/GMT-13'; +$a->strings['Etc/GMT-14'] = 'Etc/GMT-14'; +$a->strings['Etc/GMT-2'] = 'Etc/GMT-2'; +$a->strings['Etc/GMT-3'] = 'Etc/GMT-3'; +$a->strings['Etc/GMT-4'] = 'Etc/GMT-4'; +$a->strings['Etc/GMT-5'] = 'Etc/GMT-5'; +$a->strings['Etc/GMT-6'] = 'Etc/GMT-6'; +$a->strings['Etc/GMT-7'] = 'Etc/GMT-7'; +$a->strings['Etc/GMT-8'] = 'Etc/GMT-8'; +$a->strings['Etc/GMT-9'] = 'Etc/GMT-9'; +$a->strings['Etc/GMT0'] = 'Etc/GMT0'; +$a->strings['Etc/Greenwich'] = 'Etc/Greenwich'; +$a->strings['Etc/UCT'] = 'Etc/UCT'; +$a->strings['Etc/Universal'] = 'Etc/Universal'; +$a->strings['Etc/UTC'] = 'Etc/UTC'; +$a->strings['Etc/Zulu'] = 'Etc/Zulu'; +$a->strings['Europe/Amsterdam'] = 'Europe/Amsterdam'; +$a->strings['Europe/Andorra'] = 'Europe/Andorra'; +$a->strings['Europe/Athens'] = 'Europe/Athens'; +$a->strings['Europe/Belfast'] = 'Europe/Belfast'; +$a->strings['Europe/Belgrade'] = 'Europe/Belgrade'; +$a->strings['Europe/Berlin'] = 'Europe/Berlin'; +$a->strings['Europe/Bratislava'] = 'Europe/Bratislava'; +$a->strings['Europe/Brussels'] = 'Europe/Brussels'; +$a->strings['Europe/Bucharest'] = 'Europe/Bucharest'; +$a->strings['Europe/Budapest'] = 'Europe/Budapest'; +$a->strings['Europe/Chisinau'] = 'Europe/Chisinau'; +$a->strings['Europe/Copenhagen'] = 'Europe/Copenhagen'; +$a->strings['Europe/Dublin'] = 'Europe/Dublin'; +$a->strings['Europe/Gibraltar'] = 'Europe/Gibraltar'; +$a->strings['Europe/Guernsey'] = 'Europe/Guernsey'; +$a->strings['Europe/Helsinki'] = 'Europe/Helsinki'; +$a->strings['Europe/Isle_of_Man'] = 'Europe/Isle_of_Man'; +$a->strings['Europe/Istanbul'] = 'Europe/Istanbul'; +$a->strings['Europe/Jersey'] = 'Europe/Jersey'; +$a->strings['Europe/Kaliningrad'] = 'Europe/Kaliningrad'; +$a->strings['Europe/Kiev'] = 'Europe/Kiev'; +$a->strings['Europe/Lisbon'] = 'Europe/Lisbon'; +$a->strings['Europe/Ljubljana'] = 'Europe/Ljubljana'; +$a->strings['Europe/London'] = 'Europe/London'; +$a->strings['Europe/Luxembourg'] = 'Europe/Luxembourg'; +$a->strings['Europe/Madrid'] = 'Europe/Madrid'; +$a->strings['Europe/Malta'] = 'Europe/Malta'; +$a->strings['Europe/Mariehamn'] = 'Europe/Mariehamn'; +$a->strings['Europe/Minsk'] = 'Europe/Minsk'; +$a->strings['Europe/Monaco'] = 'Europe/Monaco'; +$a->strings['Europe/Moscow'] = 'Europe/Moscow'; +$a->strings['Europe/Nicosia'] = 'Europe/Nicosia'; +$a->strings['Europe/Oslo'] = 'Europe/Oslo'; +$a->strings['Europe/Paris'] = 'Europe/Paris'; +$a->strings['Europe/Podgorica'] = 'Europe/Podgorica'; +$a->strings['Europe/Prague'] = 'Europe/Prague'; +$a->strings['Europe/Riga'] = 'Europe/Riga'; +$a->strings['Europe/Rome'] = 'Europe/Rome'; +$a->strings['Europe/Samara'] = 'Europe/Samara'; +$a->strings['Europe/San_Marino'] = 'Europe/San_Marino'; +$a->strings['Europe/Sarajevo'] = 'Europe/Sarajevo'; +$a->strings['Europe/Simferopol'] = 'Europe/Simferopol'; +$a->strings['Europe/Skopje'] = 'Europe/Skopje'; +$a->strings['Europe/Sofia'] = 'Europe/Sofia'; +$a->strings['Europe/Stockholm'] = 'Europe/Stockholm'; +$a->strings['Europe/Tallinn'] = 'Europe/Tallinn'; +$a->strings['Europe/Tirane'] = 'Europe/Tirane'; +$a->strings['Europe/Tiraspol'] = 'Europe/Tiraspol'; +$a->strings['Europe/Uzhgorod'] = 'Europe/Uzhgorod'; +$a->strings['Europe/Vaduz'] = 'Europe/Vaduz'; +$a->strings['Europe/Vatican'] = 'Europe/Vatican'; +$a->strings['Europe/Vienna'] = 'Europe/Vienna'; +$a->strings['Europe/Vilnius'] = 'Europe/Vilnius'; +$a->strings['Europe/Volgograd'] = 'Europe/Volgograd'; +$a->strings['Europe/Warsaw'] = 'Europe/Warsaw'; +$a->strings['Europe/Zagreb'] = 'Europe/Zagreb'; +$a->strings['Europe/Zaporozhye'] = 'Europe/Zaporozhye'; +$a->strings['Europe/Zurich'] = 'Europe/Zurich'; +$a->strings['Factory'] = 'Factory'; +$a->strings['GB'] = 'GB'; +$a->strings['GB-Eire'] = 'GB-Eire'; +$a->strings['GMT'] = 'GMT'; +$a->strings['GMT+0'] = 'GMT+0'; +$a->strings['GMT-0'] = 'GMT-0'; +$a->strings['GMT0'] = 'GMT0'; +$a->strings['Greenwich'] = 'Greenwich'; +$a->strings['Hongkong'] = 'Hongkong'; +$a->strings['HST'] = 'HST'; +$a->strings['Iceland'] = 'Iceland'; +$a->strings['Indian/Antananarivo'] = 'Indian/Antananarivo'; +$a->strings['Indian/Chagos'] = 'Indian/Chagos'; +$a->strings['Indian/Christmas'] = 'Indian/Christmas'; +$a->strings['Indian/Cocos'] = 'Indian/Cocos'; +$a->strings['Indian/Comoro'] = 'Indian/Comoro'; +$a->strings['Indian/Kerguelen'] = 'Indian/Kerguelen'; +$a->strings['Indian/Mahe'] = 'Indian/Mahe'; +$a->strings['Indian/Maldives'] = 'Indian/Maldives'; +$a->strings['Indian/Mauritius'] = 'Indian/Mauritius'; +$a->strings['Indian/Mayotte'] = 'Indian/Mayotte'; +$a->strings['Indian/Reunion'] = 'Indian/Reunion'; +$a->strings['Iran'] = 'Iran'; +$a->strings['Israel'] = 'Israel'; +$a->strings['Jamaica'] = 'Jamaica'; +$a->strings['Japan'] = 'Japan'; +$a->strings['Kwajalein'] = 'Kwajalein'; +$a->strings['Libya'] = 'Libya'; +$a->strings['MET'] = 'MET'; +$a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; +$a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; +$a->strings['Mexico/General'] = 'Mexico/General'; +$a->strings['MST'] = 'MST'; +$a->strings['MST7MDT'] = 'MST7MDT'; +$a->strings['Navajo'] = 'Navajo'; +$a->strings['NZ'] = 'NZ'; +$a->strings['NZ-CHAT'] = 'NZ-CHAT'; +$a->strings['Pacific/Apia'] = 'Pacific/Apia'; +$a->strings['Pacific/Auckland'] = 'Pacific/Auckland'; +$a->strings['Pacific/Chatham'] = 'Pacific/Chatham'; +$a->strings['Pacific/Easter'] = 'Pacific/Easter'; +$a->strings['Pacific/Efate'] = 'Pacific/Efate'; +$a->strings['Pacific/Enderbury'] = 'Pacific/Enderbury'; +$a->strings['Pacific/Fakaofo'] = 'Pacific/Fakaofo'; +$a->strings['Pacific/Fiji'] = 'Pacific/Fiji'; +$a->strings['Pacific/Funafuti'] = 'Pacific/Funafuti'; +$a->strings['Pacific/Galapagos'] = 'Pacific/Galapagos'; +$a->strings['Pacific/Gambier'] = 'Pacific/Gambier'; +$a->strings['Pacific/Guadalcanal'] = 'Pacific/Guadalcanal'; +$a->strings['Pacific/Guam'] = 'Pacific/Guam'; +$a->strings['Pacific/Honolulu'] = 'Pacific/Honolulu'; +$a->strings['Pacific/Johnston'] = 'Pacific/Johnston'; +$a->strings['Pacific/Kiritimati'] = 'Pacific/Kiritimati'; +$a->strings['Pacific/Kosrae'] = 'Pacific/Kosrae'; +$a->strings['Pacific/Kwajalein'] = 'Pacific/Kwajalein'; +$a->strings['Pacific/Majuro'] = 'Pacific/Majuro'; +$a->strings['Pacific/Marquesas'] = 'Pacific/Marquesas'; +$a->strings['Pacific/Midway'] = 'Pacific/Midway'; +$a->strings['Pacific/Nauru'] = 'Pacific/Nauru'; +$a->strings['Pacific/Niue'] = 'Pacific/Niue'; +$a->strings['Pacific/Norfolk'] = 'Pacific/Norfolk'; +$a->strings['Pacific/Noumea'] = 'Pacific/Noumea'; +$a->strings['Pacific/Pago_Pago'] = 'Pacific/Pago_Pago'; +$a->strings['Pacific/Palau'] = 'Pacific/Palau'; +$a->strings['Pacific/Pitcairn'] = 'Pacific/Pitcairn'; +$a->strings['Pacific/Ponape'] = 'Pacific/Ponape'; +$a->strings['Pacific/Port_Moresby'] = 'Pacific/Port_Moresby'; +$a->strings['Pacific/Rarotonga'] = 'Pacific/Rarotonga'; +$a->strings['Pacific/Saipan'] = 'Pacific/Saipan'; +$a->strings['Pacific/Samoa'] = 'Pacific/Samoa'; +$a->strings['Pacific/Tahiti'] = 'Pacific/Tahiti'; +$a->strings['Pacific/Tarawa'] = 'Pacific/Tarawa'; +$a->strings['Pacific/Tongatapu'] = 'Pacific/Tongatapu'; +$a->strings['Pacific/Truk'] = 'Pacific/Truk'; +$a->strings['Pacific/Wake'] = 'Pacific/Wake'; +$a->strings['Pacific/Wallis'] = 'Pacific/Wallis'; +$a->strings['Pacific/Yap'] = 'Pacific/Yap'; +$a->strings['Poland'] = 'Poland'; +$a->strings['Portugal'] = 'Portugal'; +$a->strings['PRC'] = 'PRC'; +$a->strings['PST8PDT'] = 'PST8PDT'; +$a->strings['ROC'] = 'ROC'; +$a->strings['ROK'] = 'ROK'; +$a->strings['Singapore'] = 'Singapore'; +$a->strings['Turkey'] = 'Turkey'; +$a->strings['UCT'] = 'UCT'; +$a->strings['Universal'] = 'Universal'; +$a->strings['US/Alaska'] = 'US/Alaska'; +$a->strings['US/Aleutian'] = 'US/Aleutian'; +$a->strings['US/Arizona'] = 'US/Arizona'; +$a->strings['US/Central'] = 'US/Central'; +$a->strings['US/East-Indiana'] = 'US/East-Indiana'; +$a->strings['US/Eastern'] = 'US/Eastern'; +$a->strings['US/Hawaii'] = 'US/Hawaii'; +$a->strings['US/Indiana-Starke'] = 'US/Indiana-Starke'; +$a->strings['US/Michigan'] = 'US/Michigan'; +$a->strings['US/Mountain'] = 'US/Mountain'; +$a->strings['US/Pacific'] = 'US/Pacific'; +$a->strings['US/Pacific-New'] = 'US/Pacific-New'; +$a->strings['US/Samoa'] = 'US/Samoa'; +$a->strings['UTC'] = 'UTC'; +$a->strings['W-SU'] = 'W-SU'; +$a->strings['WET'] = 'WET'; +$a->strings['Zulu'] = 'Zulu'; diff --git a/view/it/wall_item_drop.tpl b/view/it/wall_item_drop.tpl new file mode 100644 index 000000000..f4ef81c52 --- /dev/null +++ b/view/it/wall_item_drop.tpl @@ -0,0 +1,9 @@ +

+ +

+ diff --git a/view/it/wall_received_eml.tpl b/view/it/wall_received_eml.tpl new file mode 100644 index 000000000..ba9e25901 --- /dev/null +++ b/view/it/wall_received_eml.tpl @@ -0,0 +1,18 @@ + +Caro/a $username, + + '$from' ha scritto qualcosa sulla bachecha del tuo profilo. + +----- +$body +----- + +Accedi a $siteurl per vedere o cancellare l'elemento: + +$display + +Grazie, + L'amministratore di $sitename + + + diff --git a/view/it/wallwall_item.tpl b/view/it/wallwall_item.tpl new file mode 100644 index 000000000..bc2d3f2ec --- /dev/null +++ b/view/it/wallwall_item.tpl @@ -0,0 +1,36 @@ +

+ +

+ +

+ $lock + $name a $owner_name via Bacheca-A-Bacheca:
+

$ago

$location

+ $vote +

$title

$body

+ $drop +

$like

$dislike

+ $comment +

+ +

+ -- cgit v1.2.3 From 68868fd74bbc6a6f2268b6c5467ccf9e025af011 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 23 Dec 2010 21:52:51 +0100 Subject: OpenID delegation degrade gracefully if database table is not updated. --- mod/profile.php | 32 ++++++++++++++++---------------- mod/settings.php | 7 ++++++- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/mod/profile.php b/mod/profile.php index 000e955ea..a5f440f43 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -20,24 +20,24 @@ function profile_init(&$a) { if (!get_config('system','no_openid') && $a->profile['openid']!=""){ if (!isset($a->profile['openidserver'])){ - die('friendika user table must be updated. `openidserver` field is missing'); - } - if ($a->profile['openidserver']==''){ - require_once('library/openid.php'); - $openid = new LightOpenID; - $openid->identity = $a->profile['openid']; - $a->profile['openidserver'] = $openid->discover($openid->identity); - - q("UPDATE `user` SET `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", - dbesc($a->profile['openidserver']), - intval($a->profile['uid']) - ); - } + logger('friendika user table must be updated. `openidserver` field is missing'); + } else { + if ($a->profile['openidserver']==''){ + require_once('library/openid.php'); + $openid = new LightOpenID; + $openid->identity = $a->profile['openid']; + $a->profile['openidserver'] = $openid->discover($openid->identity); + + q("UPDATE `user` SET `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", + dbesc($a->profile['openidserver']), + intval($a->profile['uid']) + ); + } - $a->page['htmlhead'] .= ''. "\r\n"; - $a->page['htmlhead'] .= ''. "\r\n"; - + $a->page['htmlhead'] .= ''. "\r\n"; + $a->page['htmlhead'] .= ''. "\r\n"; + } } diff --git a/mod/settings.php b/mod/settings.php index 4743ecd66..af826c53b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -109,7 +109,12 @@ function settings_post(&$a) { $str_group_deny = perms2str($_POST['group_deny']); $str_contact_deny = perms2str($_POST['contact_deny']); - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d WHERE `uid` = %d LIMIT 1", + $openidserver=""; + if ($openid != $a->user['openid'] && isset($a->user['openidserver'])){ + $openidserver = ", `openidserver` = ''"; + } + + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d".$openidserver." WHERE `uid` = %d LIMIT 1", dbesc($username), dbesc($email), dbesc($openid), -- cgit v1.2.3 From c55cb45855ede35e593f6a1ed5e5878144cf0ad0 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 23 Dec 2010 14:40:32 -0800 Subject: revised openid patch, added fix for Windows servers, make "is now friends with" commentable, fix settings form hook to be inside form --- boot.php | 6 +++--- mod/dfrn_confirm.php | 1 + mod/profile.php | 31 ++++++------------------------- mod/settings.php | 18 +++++++++++++----- update.php | 4 ++++ view/en/settings.tpl | 4 ---- view/it/settings.tpl | 4 ---- 7 files changed, 27 insertions(+), 41 deletions(-) diff --git a/boot.php b/boot.php index 3a6886fd1..57d69a5e1 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'BUILD_ID', 1028 ); +define ( 'BUILD_ID', 1029 ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'EOL', "
\r\n" ); @@ -211,14 +211,14 @@ class App { if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") $this->query_string = substr($_SERVER['QUERY_STRING'],2); if(x($_GET,'q')) - $this->cmd = trim($_GET['q'],'/'); + $this->cmd = trim($_GET['q'],'/\\'); /** * Figure out if we are running at the top of a domain * or in a sub-directory and adjust accordingly */ - $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/'); + $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\'); if(isset($path) && strlen($path) && ($path != $this->path)) $this->path = $path; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 6b9bbfe13..41e0771af 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -432,6 +432,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $arr['object'] .= '' . xmlify('' . "\n"); $arr['object'] .= xmlify('' . "\n"); $arr['object'] .= '' . "\n"; + $arr['last-child'] = 1; $i = item_store($arr); diff --git a/mod/profile.php b/mod/profile.php index a5f440f43..ffc412805 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -18,38 +18,19 @@ function profile_init(&$a) { profile_load($a,$which,$profile); - if (!get_config('system','no_openid') && $a->profile['openid']!=""){ - if (!isset($a->profile['openidserver'])){ - logger('friendika user table must be updated. `openidserver` field is missing'); - } else { - if ($a->profile['openidserver']==''){ - require_once('library/openid.php'); - $openid = new LightOpenID; - $openid->identity = $a->profile['openid']; - $a->profile['openidserver'] = $openid->discover($openid->identity); - - q("UPDATE `user` SET `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", - dbesc($a->profile['openidserver']), - intval($a->profile['uid']) - ); - } - - - $a->page['htmlhead'] .= ''. "\r\n"; - $a->page['htmlhead'] .= ''. "\r\n"; - } - + if(x($a->profile,'openidserver')) + $a->page['htmlhead'] .= '' . "\r\n"; + if(x($a->profile,'openid')) { + $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']); + $a->page['htmlhead'] .= '' . "\r\n"; } - - $a->page['htmlhead'] .= '' . "\r\n" ; $a->page['htmlhead'] .= '' . "\r\n" ; $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); $a->page['htmlhead'] .= '' . "\r\n"; header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); - - + $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); foreach($dfrn_pages as $dfrn) $a->page['htmlhead'] .= "get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n"; diff --git a/mod/settings.php b/mod/settings.php index af826c53b..6eaa17ad0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -109,12 +109,17 @@ function settings_post(&$a) { $str_group_deny = perms2str($_POST['group_deny']); $str_contact_deny = perms2str($_POST['contact_deny']); - $openidserver=""; - if ($openid != $a->user['openid'] && isset($a->user['openidserver'])){ - $openidserver = ", `openidserver` = ''"; + $openidserver = $a->user['openidserver']; + + if($openid != $a->user['openid']) { + logger('updating openidserver'); + require_once('library/openid.php'); + $open_id_obj = new LightOpenID; + $open_id_obj->identity = $openid; + $openidserver = $open_id_obj->discover($open_id_obj->identity); } - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d".$openidserver." WHERE `uid` = %d LIMIT 1", + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", dbesc($username), dbesc($email), dbesc($openid), @@ -129,6 +134,7 @@ function settings_post(&$a) { intval($allow_location), dbesc($theme), intval($maxreq), + dbesc($openidserver), intval(local_user()) ); if($r) @@ -306,7 +312,9 @@ function settings_content(&$a) { '$pagetype' => $pagetype )); - call_hooks('settings_page',$o); + call_hooks('settings_form',$o); + + $o .= '' . "\r\n"; return $o; diff --git a/update.php b/update.php index 5807f1a34..d6fab4255 100644 --- a/update.php +++ b/update.php @@ -270,3 +270,7 @@ function update_1027() { ) ENGINE = MYISAM DEFAULT CHARSET=utf8 "); } +function update_1028() { + q("ALTER TABLE `user` ADD `openidserver` text NOT NULL AFTER `deny_gid` "); +} + diff --git a/view/en/settings.tpl b/view/en/settings.tpl index aea463742..b29398a62 100644 --- a/view/en/settings.tpl +++ b/view/en/settings.tpl @@ -159,7 +159,3 @@ $pagetype - - - - diff --git a/view/it/settings.tpl b/view/it/settings.tpl index f50a2151b..eeea36dfd 100644 --- a/view/it/settings.tpl +++ b/view/it/settings.tpl @@ -159,7 +159,3 @@ $pagetype - - - - -- cgit v1.2.3

Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '

' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '

$header

Visibiltà Profiloe

Reputazione Online

Ritaglia Immagine

Elenco del Sito

Modifica Gruppo

Friendika Social Network

Installazione

Notifiche di Amicizia/Collegamento in Attesa

Dimenticato la tua Password?

Modifica i dettagli del profilo

Profiles

Upload Profile Photo

Resetta Password

Impostazioni account

Impostazioni base

Impostazioni si Sicurezza e Privacy

Impostazione Notifiche

Impostazioni Password

Impostazioni Avanzante Pagina