From 78fb6f55ed91b95353b6904157c74847d31ead44 Mon Sep 17 00:00:00 2001
From: Paolo Tacconi
Date: Mon, 7 Sep 2015 17:24:43 +0200
Subject: Updated Italian strings
---
view/it/messages.po | 727 ++++++++++++++++++++++++++--------------------------
view/it/strings.php | 36 +--
2 files changed, 387 insertions(+), 376 deletions(-)
diff --git a/view/it/messages.po b/view/it/messages.po
index 3e2538443..452c1712c 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,10 +13,10 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-31 00:03-0700\n"
-"PO-Revision-Date: 2015-08-03 07:18+0000\n"
+"POT-Creation-Date: 2015-08-28 00:04-0700\n"
+"PO-Revision-Date: 2015-09-07 15:06+0000\n"
"Last-Translator: tuscanhobbit \n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -38,8 +38,8 @@ msgstr "Foto del profilo"
#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
#: ../../include/ItemObject.php:100 ../../include/apps.php:254
#: ../../mod/webpages.php:181 ../../mod/thing.php:227
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/blocks.php:153
+#: ../../mod/connections.php:242 ../../mod/connections.php:255
+#: ../../mod/connections.php:274 ../../mod/blocks.php:153
#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
#: ../../mod/menu.php:103 ../../mod/settings.php:650 ../../mod/layouts.php:183
@@ -129,7 +129,7 @@ msgstr "Impossibile trovare il nome utente nel file da importare."
msgid "Unable to create a unique channel address. Import failed."
msgstr "Impossibile creare un indirizzo univoco per il canale. L'import è fallito."
-#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:562
msgid "Import completed."
msgstr "L'importazione è terminata con successo!"
@@ -357,7 +357,7 @@ msgstr "Modalità SafeSearch"
#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
#: ../../mod/settings.php:579 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:663
+#: ../../mod/connedit.php:647 ../../mod/connedit.php:675
#: ../../view/theme/redbasic/php/config.php:104
#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
msgid "No"
@@ -393,7 +393,7 @@ msgid "View"
msgstr "Guarda"
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1155 ../../mod/webpages.php:188
+#: ../../include/conversation.php:1166 ../../mod/webpages.php:188
#: ../../mod/events.php:667 ../../mod/editpost.php:143
#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
#: ../../mod/editblock.php:170
@@ -422,7 +422,7 @@ msgstr "Creato"
msgid "Edited"
msgstr "Modificato"
-#: ../../include/api.php:1193
+#: ../../include/api.php:1234
msgid "Public Timeline"
msgstr "Diario pubblico"
@@ -493,7 +493,7 @@ msgid "Rate This Channel (this is public)"
msgstr "Valuta questo canale (visibile a tutti)"
#: ../../include/js_strings.php:20 ../../mod/rate.php:156
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:683
msgid "Rating"
msgstr "Valutazioni"
@@ -506,7 +506,7 @@ msgstr "Descrizione (facoltativa)"
#: ../../mod/thing.php:318 ../../mod/events.php:494 ../../mod/events.php:670
#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
-#: ../../mod/pdledit.php:58 ../../mod/import.php:534 ../../mod/chat.php:177
+#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177
#: ../../mod/chat.php:211 ../../mod/mitem.php:232 ../../mod/rate.php:167
#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
@@ -518,7 +518,7 @@ msgstr "Descrizione (facoltativa)"
#: ../../mod/settings.php:718 ../../mod/settings.php:746
#: ../../mod/settings.php:769 ../../mod/settings.php:854
#: ../../mod/settings.php:1050 ../../mod/mood.php:134
-#: ../../mod/connedit.php:692 ../../mod/mail.php:355 ../../mod/appman.php:99
+#: ../../mod/connedit.php:704 ../../mod/mail.php:355 ../../mod/appman.php:99
#: ../../mod/pconfig.php:108 ../../mod/poll.php:68
#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
#: ../../view/theme/redbasic/php/config.php:99
@@ -986,7 +986,7 @@ msgstr "Appuntamenti ricevuti"
msgid "Schedule Outbox"
msgstr "Appuntamenti inviati"
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1030
#: ../../include/apps.php:336 ../../include/apps.php:387
#: ../../mod/photos.php:693 ../../mod/photos.php:1131
msgid "Unknown"
@@ -1003,7 +1003,7 @@ msgid "%1$s used of %2$s (%3$s%)"
msgstr "%1$s occupati di %2$s (%3$s%)"
#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1609 ../../include/apps.php:135
+#: ../../include/conversation.php:1620 ../../include/apps.php:135
#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr "Archivio file"
@@ -1025,7 +1025,7 @@ msgstr "Crea"
#: ../../include/RedDAV/RedBrowser.php:257
#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
-#: ../../mod/events.php:493 ../../mod/photos.php:718 ../../mod/photos.php:1248
+#: ../../mod/photos.php:718 ../../mod/photos.php:1248
msgid "Upload"
msgstr "Carica"
@@ -1048,12 +1048,12 @@ msgid "Last Modified"
msgstr "Ultima modifica"
#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120
-#: ../../include/conversation.php:660 ../../include/apps.php:255
+#: ../../include/conversation.php:671 ../../include/apps.php:255
#: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176
#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
-#: ../../mod/settings.php:651 ../../mod/connedit.php:551
+#: ../../mod/settings.php:651 ../../mod/connedit.php:563
msgid "Delete"
msgstr "Elimina"
@@ -1366,7 +1366,7 @@ msgstr "Apps"
msgid "System"
msgstr "Sistema"
-#: ../../include/widgets.php:94 ../../include/conversation.php:1504
+#: ../../include/widgets.php:94 ../../include/conversation.php:1515
msgid "Personal"
msgstr "Personali"
@@ -1379,8 +1379,8 @@ msgid "Edit Personal App"
msgstr "Modifica una app personale"
#: ../../include/widgets.php:136 ../../include/widgets.php:175
-#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:857 ../../mod/directory.php:316
+#: ../../include/Contact.php:107 ../../include/conversation.php:956
+#: ../../include/identity.php:880 ../../mod/directory.php:316
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr "Aggiungi"
@@ -1389,7 +1389,7 @@ msgstr "Aggiungi"
msgid "Ignore/Hide"
msgstr "Ignora/nascondi"
-#: ../../include/widgets.php:143 ../../mod/connections.php:268
+#: ../../include/widgets.php:143 ../../mod/connections.php:128
msgid "Suggestions"
msgstr "Suggerimenti"
@@ -1431,11 +1431,11 @@ msgstr "Tutto"
msgid "Archives"
msgstr "Archivi"
-#: ../../include/widgets.php:429 ../../mod/connedit.php:571
+#: ../../include/widgets.php:429 ../../mod/connedit.php:583
msgid "Me"
msgstr "Io"
-#: ../../include/widgets.php:430 ../../mod/connedit.php:572
+#: ../../include/widgets.php:430 ../../mod/connedit.php:584
msgid "Family"
msgstr "Famiglia"
@@ -1444,16 +1444,16 @@ msgstr "Famiglia"
#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
#: ../../mod/settings.php:349 ../../mod/settings.php:350
#: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:573
+#: ../../mod/connedit.php:585
msgid "Friends"
msgstr "Amici"
-#: ../../include/widgets.php:432 ../../mod/connedit.php:574
+#: ../../include/widgets.php:432 ../../mod/connedit.php:586
msgid "Acquaintances"
msgstr "Conoscenti"
-#: ../../include/widgets.php:433 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:575
+#: ../../include/widgets.php:433 ../../mod/connections.php:91
+#: ../../mod/connections.php:106 ../../mod/connedit.php:587
msgid "All"
msgstr "Tutti"
@@ -1489,7 +1489,7 @@ msgstr "App connesse"
msgid "Export channel"
msgstr "Esporta il canale"
-#: ../../include/widgets.php:532 ../../mod/connedit.php:662
+#: ../../include/widgets.php:532 ../../mod/connedit.php:674
msgid "Connection Default Permissions"
msgstr "Permessi predefiniti dei nuovi contatti"
@@ -1557,7 +1557,7 @@ msgid "Finishes:"
msgstr "Fine:"
#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:908 ../../mod/directory.php:302
+#: ../../include/identity.php:931 ../../mod/directory.php:302
#: ../../mod/events.php:661
msgid "Location:"
msgstr "Luogo:"
@@ -1819,11 +1819,11 @@ msgstr "l'account locale non è stato trovato."
msgid "Cannot connect to yourself."
msgstr "Non puoi connetterti a te stesso."
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:667
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:678
msgid "Private Message"
msgstr "Messaggio privato"
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:659
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:670
msgid "Select"
msgstr "Seleziona"
@@ -1856,13 +1856,13 @@ msgid "I abstain"
msgstr "Mi astengo"
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1677 ../../mod/photos.php:1015
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1015
#: ../../mod/photos.php:1027
msgid "View all"
msgstr "Vedi tutto"
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1167
+#: ../../include/conversation.php:1712 ../../include/identity.php:1190
#: ../../mod/photos.php:1019
msgctxt "noun"
msgid "Like"
@@ -1870,7 +1870,7 @@ msgid_plural "Likes"
msgstr[0] "Mi piace"
msgstr[1] "Mi piace"
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
#: ../../mod/photos.php:1024
msgctxt "noun"
msgid "Dislike"
@@ -1894,11 +1894,11 @@ msgstr "Attiva/disattiva preferito"
msgid "starred"
msgstr "preferito"
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:674
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:685
msgid "Message signature validated"
msgstr "Messaggio con firma verificata"
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:675
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:686
msgid "Message signature incorrect"
msgstr "Massaggio con firma non corretta"
@@ -1958,17 +1958,17 @@ msgstr "Da bacheca a bacheca"
msgid "via Wall-To-Wall:"
msgstr "da bacheca a bacheca:"
-#: ../../include/ItemObject.php:312 ../../include/conversation.php:716
+#: ../../include/ItemObject.php:312 ../../include/conversation.php:727
#, php-format
msgid "from %s"
msgstr "da %s"
-#: ../../include/ItemObject.php:315 ../../include/conversation.php:719
+#: ../../include/ItemObject.php:315 ../../include/conversation.php:730
#, php-format
msgid "last edited: %s"
msgstr "ultima modifica: %s"
-#: ../../include/ItemObject.php:316 ../../include/conversation.php:720
+#: ../../include/ItemObject.php:316 ../../include/conversation.php:731
#, php-format
msgid "Expires: %s"
msgstr "Scadenza: %s"
@@ -2000,8 +2000,8 @@ msgstr "Non mi piace"
msgid "Close"
msgstr "Chiudi"
-#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1209 ../../mod/editpost.php:123
+#: ../../include/ItemObject.php:364 ../../include/conversation.php:748
+#: ../../include/conversation.php:1220 ../../mod/editpost.php:123
#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
#: ../../mod/mail.php:241 ../../mod/mail.php:356
@@ -2013,31 +2013,31 @@ msgstr "Attendere"
msgid "This is you"
msgstr "Questo sei tu"
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1192
#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
msgid "Bold"
msgstr "Grassetto"
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1193
#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
msgid "Italic"
msgstr "Corsivo"
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1194
#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
msgid "Underline"
msgstr "Sottolineato"
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1195
#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
msgid "Quote"
msgstr "Citazione"
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1196
#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
msgid "Code"
@@ -2055,7 +2055,7 @@ msgstr "Collegamento"
msgid "Video"
msgstr "Video"
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1247
#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
msgid "Encrypt text"
msgstr "Crittografia del testo"
@@ -2068,7 +2068,7 @@ msgstr "Nuova finestra"
msgid "Open the selected location in a different window or browser tab"
msgstr "Apri l'indirizzo selezionato in una nuova scheda o finestra"
-#: ../../include/Contact.php:215 ../../mod/admin.php:739
+#: ../../include/Contact.php:212
#, php-format
msgid "User '%s' deleted"
msgstr "Utente '%s' eliminato"
@@ -2097,8 +2097,8 @@ msgstr "Bacheca"
msgid "Your posts and conversations"
msgstr "I tuoi post e conversazioni"
-#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:498
+#: ../../include/nav.php:91 ../../include/conversation.php:953
+#: ../../mod/connedit.php:510
msgid "View Profile"
msgstr "Profilo"
@@ -2114,7 +2114,7 @@ msgstr "Modifica i profili"
msgid "Manage/Edit profiles"
msgstr "Gestisci/modifica i profili"
-#: ../../include/nav.php:95 ../../include/identity.php:880
+#: ../../include/nav.php:95 ../../include/identity.php:903
msgid "Edit Profile"
msgstr "Modifica il profilo"
@@ -2122,7 +2122,7 @@ msgstr "Modifica il profilo"
msgid "Edit your profile"
msgstr "Modifica il profilo"
-#: ../../include/nav.php:97 ../../include/conversation.php:1600
+#: ../../include/nav.php:97 ../../include/conversation.php:1611
#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr "Foto"
@@ -2143,7 +2143,7 @@ msgstr "Area chat"
msgid "Your chatrooms"
msgstr "Le tue aree chat"
-#: ../../include/nav.php:109 ../../include/conversation.php:1635
+#: ../../include/nav.php:109 ../../include/conversation.php:1646
#: ../../include/apps.php:129
msgid "Bookmarks"
msgstr "Segnalibri"
@@ -2152,7 +2152,7 @@ msgstr "Segnalibri"
msgid "Your bookmarks"
msgstr "I tuoi segnalibri"
-#: ../../include/nav.php:113 ../../include/conversation.php:1645
+#: ../../include/nav.php:113 ../../include/conversation.php:1656
#: ../../include/apps.php:136 ../../mod/webpages.php:178
msgid "Webpages"
msgstr "Pagine web"
@@ -2243,7 +2243,7 @@ msgstr "Bacheca del canale"
msgid "Mark all channel notifications seen"
msgstr "Segna come lette le notifiche del canale"
-#: ../../include/nav.php:187 ../../mod/connections.php:407
+#: ../../include/nav.php:187 ../../mod/connections.php:267
msgid "Connections"
msgstr "Contatti"
@@ -2325,7 +2325,7 @@ msgstr "Amministrazione"
msgid "Site Setup and Configuration"
msgstr "Installazione e configurazione del sito"
-#: ../../include/nav.php:247 ../../include/conversation.php:850
+#: ../../include/nav.php:247 ../../include/conversation.php:861
msgid "Loading..."
msgstr "Caricamento in corso..."
@@ -2561,441 +2561,441 @@ msgctxt "mood"
msgid "%1$s is %2$s"
msgstr "%1$s è %2$s"
-#: ../../include/conversation.php:572 ../../mod/photos.php:996
+#: ../../include/conversation.php:583 ../../mod/photos.php:996
msgctxt "title"
msgid "Likes"
msgstr "Mi piace"
-#: ../../include/conversation.php:572 ../../mod/photos.php:996
+#: ../../include/conversation.php:583 ../../mod/photos.php:996
msgctxt "title"
msgid "Dislikes"
msgstr "Non mi piace"
-#: ../../include/conversation.php:573 ../../mod/photos.php:997
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
msgctxt "title"
msgid "Agree"
msgstr "D'accordo"
-#: ../../include/conversation.php:573 ../../mod/photos.php:997
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
msgctxt "title"
msgid "Disagree"
msgstr "Non d'accordo"
-#: ../../include/conversation.php:573 ../../mod/photos.php:997
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
msgctxt "title"
msgid "Abstain"
msgstr "Astenuti"
-#: ../../include/conversation.php:574 ../../mod/photos.php:998
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
msgctxt "title"
msgid "Attending"
msgstr "Partecipano"
-#: ../../include/conversation.php:574 ../../mod/photos.php:998
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
msgctxt "title"
msgid "Not attending"
msgstr "Non partecipano"
-#: ../../include/conversation.php:574 ../../mod/photos.php:998
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
msgctxt "title"
msgid "Might attend"
msgstr "Forse partecipano"
-#: ../../include/conversation.php:692
+#: ../../include/conversation.php:703
#, php-format
msgid "View %s's profile @ %s"
msgstr "Vedi il profilo di %s @ %s"
-#: ../../include/conversation.php:707
+#: ../../include/conversation.php:718
msgid "Categories:"
msgstr "Categorie:"
-#: ../../include/conversation.php:708
+#: ../../include/conversation.php:719
msgid "Filed under:"
msgstr "Classificato come:"
-#: ../../include/conversation.php:735
+#: ../../include/conversation.php:746
msgid "View in context"
msgstr "Vedi nel contesto"
-#: ../../include/conversation.php:846
+#: ../../include/conversation.php:857
msgid "remove"
msgstr "rimuovi"
-#: ../../include/conversation.php:851
+#: ../../include/conversation.php:862
msgid "Delete Selected Items"
msgstr "Elimina gli oggetti selezionati"
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:950
msgid "View Source"
msgstr "Vedi il sorgente"
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:951
msgid "Follow Thread"
msgstr "Segui la discussione"
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:952
msgid "View Status"
msgstr "Guarda il messaggio di stato"
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:954
msgid "View Photos"
msgstr "Guarda le foto"
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:955
msgid "Matrix Activity"
msgstr "Attività nella tua rete"
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:957
msgid "Edit Contact"
msgstr "Modifica il contatto"
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:958
msgid "Send PM"
msgstr "Invia messaggio privato"
-#: ../../include/conversation.php:948 ../../include/apps.php:145
+#: ../../include/conversation.php:959 ../../include/apps.php:145
msgid "Poke"
msgstr "Poke"
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1073
#, php-format
msgid "%s likes this."
msgstr "Piace a %s."
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1073
#, php-format
msgid "%s doesn't like this."
msgstr "Non piace a %s."
-#: ../../include/conversation.php:1066
+#: ../../include/conversation.php:1077
#, php-format
msgid "%2$d people like this."
msgid_plural "%2$d people like this."
msgstr[0] ""
msgstr[1] "Piace a %2$d persone."
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1079
#, php-format
msgid "%2$d people don't like this."
msgid_plural "%2$d people don't like this."
msgstr[0] ""
msgstr[1] "Non piace a %2$d persone."
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1085
msgid "and"
msgstr "e"
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1088
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] "e altre %d persone"
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1089
#, php-format
msgid "%s like this."
msgstr "Piace a %s."
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1089
#, php-format
msgid "%s don't like this."
msgstr "Non piace a %s."
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1151
msgid "Visible to everybody"
msgstr "Visibile a tutti"
-#: ../../include/conversation.php:1141 ../../mod/mail.php:174
+#: ../../include/conversation.php:1152 ../../mod/mail.php:174
#: ../../mod/mail.php:289
msgid "Please enter a link URL:"
msgstr "Inserisci l'indirizzo del link:"
-#: ../../include/conversation.php:1142
+#: ../../include/conversation.php:1153
msgid "Please enter a video link/URL:"
msgstr "Inserisci l'indirizzo del video:"
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1154
msgid "Please enter an audio link/URL:"
msgstr "Inserisci l'indirizzo dell'audio:"
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1155
msgid "Tag term:"
msgstr "Tag:"
-#: ../../include/conversation.php:1145 ../../mod/filer.php:49
+#: ../../include/conversation.php:1156 ../../mod/filer.php:49
msgid "Save to Folder:"
msgstr "Salva nella cartella:"
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1157
msgid "Where are you right now?"
msgstr "Dove sei ora?"
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:47
+#: ../../include/conversation.php:1158 ../../mod/editpost.php:47
#: ../../mod/mail.php:175 ../../mod/mail.php:290
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Scade il YYYY-MM-DD HH:MM"
-#: ../../include/conversation.php:1174 ../../mod/webpages.php:182
+#: ../../include/conversation.php:1185 ../../mod/webpages.php:182
#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184
msgid "Share"
msgstr "Condividi"
-#: ../../include/conversation.php:1176
+#: ../../include/conversation.php:1187
msgid "Page link name"
msgstr "Nome del link alla pagina"
-#: ../../include/conversation.php:1179
+#: ../../include/conversation.php:1190
msgid "Post as"
msgstr "Pubblica come "
-#: ../../include/conversation.php:1186 ../../mod/editpost.php:112
+#: ../../include/conversation.php:1197 ../../mod/editpost.php:112
#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
msgid "Upload photo"
msgstr "Carica foto"
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1198
msgid "upload photo"
msgstr "carica foto"
-#: ../../include/conversation.php:1188 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1199 ../../mod/editpost.php:113
#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
msgid "Attach file"
msgstr "Allega file"
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1200
msgid "attach file"
msgstr "allega file"
-#: ../../include/conversation.php:1190 ../../mod/editpost.php:114
+#: ../../include/conversation.php:1201 ../../mod/editpost.php:114
#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
msgid "Insert web link"
msgstr "Inserisci un indirizzo web"
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1202
msgid "web link"
msgstr "link web"
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1203
msgid "Insert video link"
msgstr "Inserisci l'indirizzo di un video"
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1204
msgid "video link"
msgstr "link video"
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1205
msgid "Insert audio link"
msgstr "Inserisci l'indirizzo di un audio"
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1206
msgid "audio link"
msgstr "link audio"
-#: ../../include/conversation.php:1196 ../../mod/editpost.php:118
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:118
#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
#: ../../mod/editblock.php:147
msgid "Set your location"
msgstr "La tua località"
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1208
msgid "set location"
msgstr "la tua località"
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:120
+#: ../../include/conversation.php:1209 ../../mod/editpost.php:120
msgid "Toggle voting"
msgstr "Abilita/disabilita il voto"
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:119
+#: ../../include/conversation.php:1212 ../../mod/editpost.php:119
#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
#: ../../mod/editblock.php:148
msgid "Clear browser location"
msgstr "Rimuovi la località data dal browser"
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1213
msgid "clear location"
msgstr "rimuovi la località"
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:135
+#: ../../include/conversation.php:1215 ../../mod/editpost.php:135
#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
msgid "Title (optional)"
msgstr "Titolo (opzionale)"
-#: ../../include/conversation.php:1208 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1219 ../../mod/editpost.php:137
#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
#: ../../mod/editblock.php:164
msgid "Categories (optional, comma-separated list)"
msgstr "Categorie (lista separata da virgole)"
-#: ../../include/conversation.php:1210 ../../mod/editpost.php:124
+#: ../../include/conversation.php:1221 ../../mod/editpost.php:124
#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
#: ../../mod/editblock.php:150
msgid "Permission settings"
msgstr "Impostazioni permessi"
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1222
msgid "permissions"
msgstr "permessi"
-#: ../../include/conversation.php:1219 ../../mod/editpost.php:132
+#: ../../include/conversation.php:1230 ../../mod/editpost.php:132
#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
#: ../../mod/editblock.php:158
msgid "Public post"
msgstr "Post pubblico"
-#: ../../include/conversation.php:1221 ../../mod/editpost.php:138
+#: ../../include/conversation.php:1232 ../../mod/editpost.php:138
#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
#: ../../mod/editblock.php:165
msgid "Example: bob@example.com, mary@example.com"
msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
-#: ../../include/conversation.php:1234 ../../mod/editpost.php:149
+#: ../../include/conversation.php:1245 ../../mod/editpost.php:149
#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
msgid "Set expiration date"
msgstr "Data di scadenza"
-#: ../../include/conversation.php:1238 ../../mod/events.php:651
+#: ../../include/conversation.php:1249 ../../mod/events.php:651
#: ../../mod/editpost.php:153
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1239 ../../mod/tagrm.php:11
+#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11
#: ../../mod/tagrm.php:134 ../../mod/events.php:650 ../../mod/fbrowser.php:82
#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
#: ../../mod/settings.php:589 ../../mod/settings.php:615
msgid "Cancel"
msgstr "Annulla"
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1492
msgid "Discover"
msgstr "Scopri"
-#: ../../include/conversation.php:1484
+#: ../../include/conversation.php:1495
msgid "Imported public streams"
msgstr "Contenuti pubblici importati"
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1500
msgid "Commented Order"
msgstr "Ultimi commenti"
-#: ../../include/conversation.php:1492
+#: ../../include/conversation.php:1503
msgid "Sort by Comment Date"
msgstr "Per data del commento"
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1507
msgid "Posted Order"
msgstr "Ultimi post"
-#: ../../include/conversation.php:1499
+#: ../../include/conversation.php:1510
msgid "Sort by Post Date"
msgstr "Per data di creazione"
-#: ../../include/conversation.php:1507
+#: ../../include/conversation.php:1518
msgid "Posts that mention or involve you"
msgstr "Post che ti riguardano o ti menzionano"
-#: ../../include/conversation.php:1513 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:107
+#: ../../include/conversation.php:1524 ../../mod/connections.php:72
+#: ../../mod/connections.php:85 ../../mod/menu.php:107
msgid "New"
msgstr "Novità"
-#: ../../include/conversation.php:1516
+#: ../../include/conversation.php:1527
msgid "Activity Stream - by date"
msgstr "Elenco attività - per data"
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1533
msgid "Starred"
msgstr "Preferiti"
-#: ../../include/conversation.php:1525
+#: ../../include/conversation.php:1536
msgid "Favourite Posts"
msgstr "Post preferiti"
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1543
msgid "Spam"
msgstr "Spam"
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1546
msgid "Posts flagged as SPAM"
msgstr "Post marcati come spam"
-#: ../../include/conversation.php:1579 ../../mod/admin.php:993
+#: ../../include/conversation.php:1590 ../../mod/admin.php:993
msgid "Channel"
msgstr "Canale"
-#: ../../include/conversation.php:1582
+#: ../../include/conversation.php:1593
msgid "Status Messages and Posts"
msgstr "Post e messaggi di stato"
-#: ../../include/conversation.php:1591
+#: ../../include/conversation.php:1602
msgid "About"
msgstr "Informazioni"
-#: ../../include/conversation.php:1594
+#: ../../include/conversation.php:1605
msgid "Profile Details"
msgstr "Dettagli del profilo"
-#: ../../include/conversation.php:1603 ../../include/photos.php:359
+#: ../../include/conversation.php:1614 ../../include/photos.php:359
msgid "Photo Albums"
msgstr "Album foto"
-#: ../../include/conversation.php:1612
+#: ../../include/conversation.php:1623
msgid "Files and Storage"
msgstr "Archivio file"
-#: ../../include/conversation.php:1622 ../../include/conversation.php:1625
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
msgid "Chatrooms"
msgstr "Area chat"
-#: ../../include/conversation.php:1638
+#: ../../include/conversation.php:1649
msgid "Saved Bookmarks"
msgstr "Segnalibri salvati"
-#: ../../include/conversation.php:1648
+#: ../../include/conversation.php:1659
msgid "Manage Webpages"
msgstr "Gestisci le pagine web"
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1718
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "Partecipa"
msgstr[1] "Partecipano"
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1721
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] "Non partecipa"
msgstr[1] "Non partecipano"
-#: ../../include/conversation.php:1713
+#: ../../include/conversation.php:1724
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] "Indeciso"
msgstr[1] "Indecisi"
-#: ../../include/conversation.php:1716
+#: ../../include/conversation.php:1727
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] "D'accordo"
msgstr[1] "D'accordo"
-#: ../../include/conversation.php:1719
+#: ../../include/conversation.php:1730
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] "Non d'accordo"
msgstr[1] "Non d'accordo"
-#: ../../include/conversation.php:1722
+#: ../../include/conversation.php:1733
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -3008,51 +3008,51 @@ msgstr[1] "Astenuti"
msgid "Permission denied"
msgstr "Permesso negato"
-#: ../../include/items.php:1035 ../../include/items.php:1081
+#: ../../include/items.php:1038 ../../include/items.php:1084
msgid "(Unknown)"
msgstr "(Sconosciuto)"
-#: ../../include/items.php:1307
+#: ../../include/items.php:1310
msgid "Visible to anybody on the internet."
msgstr "Visibile a chiunque su internet."
-#: ../../include/items.php:1309
+#: ../../include/items.php:1312
msgid "Visible to you only."
msgstr "Visibile solo a te."
-#: ../../include/items.php:1311
+#: ../../include/items.php:1314
msgid "Visible to anybody in this network."
msgstr "Visibile a tutti su questa rete."
-#: ../../include/items.php:1313
+#: ../../include/items.php:1316
msgid "Visible to anybody authenticated."
msgstr "Visibile a chiunque sia autenticato."
-#: ../../include/items.php:1315
+#: ../../include/items.php:1318
#, php-format
msgid "Visible to anybody on %s."
msgstr "Visibile a tutti in %s."
-#: ../../include/items.php:1317
+#: ../../include/items.php:1320
msgid "Visible to all connections."
msgstr "Visibile a tutti coloro che ti seguono."
-#: ../../include/items.php:1319
+#: ../../include/items.php:1322
msgid "Visible to approved connections."
msgstr "Visibile ai contatti approvati."
-#: ../../include/items.php:1321
+#: ../../include/items.php:1324
msgid "Visible to specific connections."
msgstr "Visibile ad alcuni contatti scelti."
-#: ../../include/items.php:4209 ../../mod/thing.php:74
+#: ../../include/items.php:4218 ../../mod/thing.php:74
#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
#: ../../mod/display.php:36
msgid "Item not found."
msgstr "Elemento non trovato."
-#: ../../include/items.php:4282 ../../include/attach.php:137
+#: ../../include/items.php:4291 ../../include/attach.php:137
#: ../../include/attach.php:184 ../../include/attach.php:247
#: ../../include/attach.php:261 ../../include/attach.php:305
#: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3066,7 +3066,7 @@ msgstr "Elemento non trovato."
#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
#: ../../mod/events.php:232 ../../mod/group.php:9 ../../mod/item.php:206
#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12
-#: ../../mod/common.php:35 ../../mod/connections.php:169
+#: ../../mod/common.php:35 ../../mod/connections.php:29
#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
@@ -3082,7 +3082,7 @@ msgstr "Elemento non trovato."
#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
-#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:336
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:348
#: ../../mod/mail.php:114 ../../mod/notifications.php:66
#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
@@ -3095,26 +3095,26 @@ msgstr "Elemento non trovato."
msgid "Permission denied."
msgstr "Permesso negato."
-#: ../../include/items.php:4684 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4693 ../../mod/group.php:38 ../../mod/group.php:140
#: ../../mod/bulksetclose.php:51
msgid "Collection not found."
msgstr "Insieme di canali non trovato."
-#: ../../include/items.php:4700
+#: ../../include/items.php:4709
msgid "Collection is empty."
msgstr "L'insieme di canali è vuoto."
-#: ../../include/items.php:4707
+#: ../../include/items.php:4716
#, php-format
msgid "Collection: %s"
msgstr "Insieme: %s"
-#: ../../include/items.php:4717 ../../mod/connedit.php:662
+#: ../../include/items.php:4726 ../../mod/connedit.php:674
#, php-format
msgid "Connection: %s"
msgstr "Contatto: %s"
-#: ../../include/items.php:4719
+#: ../../include/items.php:4728
msgid "Connection not found."
msgstr "Contatto non trovato."
@@ -3126,7 +3126,7 @@ msgstr "Dati non validi"
msgid "Unable to verify channel signature"
msgstr "Impossibile verificare la firma elettronica del canale"
-#: ../../include/zot.php:2132
+#: ../../include/zot.php:2133
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Impossibile verificare la firma elettronica del sito %s"
@@ -3179,7 +3179,7 @@ msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Per esempio: Mario Rossi, Pesca"
#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
-#: ../../mod/directory.php:384 ../../mod/connections.php:413
+#: ../../mod/directory.php:384 ../../mod/connections.php:273
msgid "Find"
msgstr "Cerca"
@@ -3324,11 +3324,11 @@ msgstr "Impossibile caricare l'identità creata"
msgid "Default Profile"
msgstr "Profilo predefinito"
-#: ../../include/identity.php:660
+#: ../../include/identity.php:683
msgid "Requested channel is not available."
msgstr "Il canale che cerchi non è disponibile."
-#: ../../include/identity.php:707 ../../mod/profile.php:16
+#: ../../include/identity.php:730 ../../mod/profile.php:16
#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
@@ -3337,193 +3337,193 @@ msgstr "Il canale che cerchi non è disponibile."
msgid "Requested profile is not available."
msgstr "Il profilo richiesto non è disponibile."
-#: ../../include/identity.php:870 ../../mod/profiles.php:774
+#: ../../include/identity.php:893 ../../mod/profiles.php:774
msgid "Change profile photo"
msgstr "Cambia la foto del profilo"
-#: ../../include/identity.php:876
+#: ../../include/identity.php:899
msgid "Profiles"
msgstr "Profili"
-#: ../../include/identity.php:876
+#: ../../include/identity.php:899
msgid "Manage/edit profiles"
msgstr "Gestisci/modifica i profili"
-#: ../../include/identity.php:877 ../../mod/profiles.php:775
+#: ../../include/identity.php:900 ../../mod/profiles.php:775
msgid "Create New Profile"
msgstr "Crea un nuovo profilo"
-#: ../../include/identity.php:892 ../../mod/profiles.php:786
+#: ../../include/identity.php:915 ../../mod/profiles.php:786
msgid "Profile Image"
msgstr "Immagine del profilo"
-#: ../../include/identity.php:895
+#: ../../include/identity.php:918
msgid "visible to everybody"
msgstr "visibile a tutti"
-#: ../../include/identity.php:896 ../../mod/profiles.php:669
+#: ../../include/identity.php:919 ../../mod/profiles.php:669
#: ../../mod/profiles.php:790
msgid "Edit visibility"
msgstr "Cambia la visibilità"
-#: ../../include/identity.php:912 ../../include/identity.php:1151
+#: ../../include/identity.php:935 ../../include/identity.php:1174
msgid "Gender:"
msgstr "Sesso:"
-#: ../../include/identity.php:913 ../../include/identity.php:1195
+#: ../../include/identity.php:936 ../../include/identity.php:1218
msgid "Status:"
msgstr "Stato:"
-#: ../../include/identity.php:914 ../../include/identity.php:1206
+#: ../../include/identity.php:937 ../../include/identity.php:1229
msgid "Homepage:"
msgstr "Home page:"
-#: ../../include/identity.php:915
+#: ../../include/identity.php:938
msgid "Online Now"
msgstr "Online adesso"
-#: ../../include/identity.php:998 ../../include/identity.php:1076
+#: ../../include/identity.php:1021 ../../include/identity.php:1099
#: ../../mod/ping.php:324
msgid "g A l F d"
msgstr "g A l d F"
-#: ../../include/identity.php:999 ../../include/identity.php:1077
+#: ../../include/identity.php:1022 ../../include/identity.php:1100
msgid "F d"
msgstr "d F"
-#: ../../include/identity.php:1044 ../../include/identity.php:1116
+#: ../../include/identity.php:1067 ../../include/identity.php:1139
#: ../../mod/ping.php:346
msgid "[today]"
msgstr "[oggi]"
-#: ../../include/identity.php:1055
+#: ../../include/identity.php:1078
msgid "Birthday Reminders"
msgstr "Promemoria compleanni"
-#: ../../include/identity.php:1056
+#: ../../include/identity.php:1079
msgid "Birthdays this week:"
msgstr "Compleanni questa settimana:"
-#: ../../include/identity.php:1109
+#: ../../include/identity.php:1132
msgid "[No description]"
msgstr "[Nessuna descrizione]"
-#: ../../include/identity.php:1127
+#: ../../include/identity.php:1150
msgid "Event Reminders"
msgstr "Promemoria"
-#: ../../include/identity.php:1128
+#: ../../include/identity.php:1151
msgid "Events this week:"
msgstr "Eventi di questa settimana:"
-#: ../../include/identity.php:1141 ../../include/identity.php:1258
+#: ../../include/identity.php:1164 ../../include/identity.php:1281
#: ../../include/apps.php:138 ../../mod/profperm.php:112
msgid "Profile"
msgstr "Profilo"
-#: ../../include/identity.php:1149 ../../mod/settings.php:1056
+#: ../../include/identity.php:1172 ../../mod/settings.php:1056
msgid "Full Name:"
msgstr "Nome completo:"
-#: ../../include/identity.php:1156
+#: ../../include/identity.php:1179
msgid "Like this channel"
msgstr "Mi piace questo canale"
-#: ../../include/identity.php:1180
+#: ../../include/identity.php:1203
msgid "j F, Y"
msgstr "j F Y"
-#: ../../include/identity.php:1181
+#: ../../include/identity.php:1204
msgid "j F"
msgstr "j F"
-#: ../../include/identity.php:1188
+#: ../../include/identity.php:1211
msgid "Birthday:"
msgstr "Compleanno:"
-#: ../../include/identity.php:1192 ../../mod/directory.php:297
+#: ../../include/identity.php:1215 ../../mod/directory.php:297
msgid "Age:"
msgstr "Età:"
-#: ../../include/identity.php:1201
+#: ../../include/identity.php:1224
#, php-format
msgid "for %1$d %2$s"
msgstr "per %1$d %2$s"
-#: ../../include/identity.php:1204 ../../mod/profiles.php:691
+#: ../../include/identity.php:1227 ../../mod/profiles.php:691
msgid "Sexual Preference:"
msgstr "Preferenze sessuali:"
-#: ../../include/identity.php:1208 ../../mod/directory.php:313
+#: ../../include/identity.php:1231 ../../mod/directory.php:313
#: ../../mod/profiles.php:693
msgid "Hometown:"
msgstr "Città dove vivo:"
-#: ../../include/identity.php:1210
+#: ../../include/identity.php:1233
msgid "Tags:"
msgstr "Tag:"
-#: ../../include/identity.php:1212 ../../mod/profiles.php:694
+#: ../../include/identity.php:1235 ../../mod/profiles.php:694
msgid "Political Views:"
msgstr "Orientamento politico:"
-#: ../../include/identity.php:1214
+#: ../../include/identity.php:1237
msgid "Religion:"
msgstr "Religione:"
-#: ../../include/identity.php:1216 ../../mod/directory.php:315
+#: ../../include/identity.php:1239 ../../mod/directory.php:315
msgid "About:"
msgstr "Informazioni:"
-#: ../../include/identity.php:1218
+#: ../../include/identity.php:1241
msgid "Hobbies/Interests:"
msgstr "Interessi e hobby:"
-#: ../../include/identity.php:1220 ../../mod/profiles.php:697
+#: ../../include/identity.php:1243 ../../mod/profiles.php:697
msgid "Likes:"
msgstr "Mi piace:"
-#: ../../include/identity.php:1222 ../../mod/profiles.php:698
+#: ../../include/identity.php:1245 ../../mod/profiles.php:698
msgid "Dislikes:"
msgstr "Non mi piace:"
-#: ../../include/identity.php:1224
+#: ../../include/identity.php:1247
msgid "Contact information and Social Networks:"
msgstr "Contatti e social network:"
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1249
msgid "My other channels:"
msgstr "I miei altri canali:"
-#: ../../include/identity.php:1228
+#: ../../include/identity.php:1251
msgid "Musical interests:"
msgstr "Gusti musicali:"
-#: ../../include/identity.php:1230
+#: ../../include/identity.php:1253
msgid "Books, literature:"
msgstr "Libri, letteratura:"
-#: ../../include/identity.php:1232
+#: ../../include/identity.php:1255
msgid "Television:"
msgstr "Televisione:"
-#: ../../include/identity.php:1234
+#: ../../include/identity.php:1257
msgid "Film/dance/culture/entertainment:"
msgstr "Film, danza, cultura, intrattenimento:"
-#: ../../include/identity.php:1236
+#: ../../include/identity.php:1259
msgid "Love/Romance:"
msgstr "Amore:"
-#: ../../include/identity.php:1238
+#: ../../include/identity.php:1261
msgid "Work/employment:"
msgstr "Lavoro:"
-#: ../../include/identity.php:1240
+#: ../../include/identity.php:1263
msgid "School/education:"
msgstr "Scuola:"
-#: ../../include/identity.php:1260
+#: ../../include/identity.php:1283
msgid "Like this thing"
msgstr "Mi piace questo Oggetto"
@@ -3845,7 +3845,7 @@ msgstr "Installa l'elemento %s:"
msgid ""
"This post contains an installable %s element, however you lack permissions "
"to install it on this site."
-msgstr "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari."
+msgstr "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari per l'installazione."
#: ../../include/bbcode.php:192 ../../mod/impel.php:37
msgid "webpage"
@@ -4437,6 +4437,10 @@ msgstr "Successivo"
msgid "Export"
msgstr "Esporta"
+#: ../../mod/events.php:493
+msgid "Import"
+msgstr "Importa"
+
#: ../../mod/events.php:518
msgid "Event removed"
msgstr "Evento eliminato"
@@ -4726,96 +4730,80 @@ msgstr "Nessun contatto in comune."
msgid "This site is not a directory server"
msgstr "Questo sito non è un server di elenchi pubblici"
-#: ../../mod/connections.php:37 ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "Non è possibile accedere alle informazioni sul contatto."
-
-#: ../../mod/connections.php:51 ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "Non riesco a trovare il profilo selezionato."
-
-#: ../../mod/connections.php:94 ../../mod/connedit.php:219
-msgid "Connection updated."
-msgstr "Contatto aggiornato."
-
-#: ../../mod/connections.php:96 ../../mod/connedit.php:221
-msgid "Failed to update connection record."
-msgstr "Impossibile aggiornare le informazioni del contatto."
-
-#: ../../mod/connections.php:192 ../../mod/connections.php:293
+#: ../../mod/connections.php:52 ../../mod/connections.php:153
msgid "Blocked"
msgstr "Bloccati"
-#: ../../mod/connections.php:197 ../../mod/connections.php:300
+#: ../../mod/connections.php:57 ../../mod/connections.php:160
msgid "Ignored"
msgstr "Ignorati"
-#: ../../mod/connections.php:202 ../../mod/connections.php:314
+#: ../../mod/connections.php:62 ../../mod/connections.php:174
msgid "Hidden"
msgstr "Nascosti"
-#: ../../mod/connections.php:207 ../../mod/connections.php:307
+#: ../../mod/connections.php:67 ../../mod/connections.php:167
msgid "Archived"
msgstr "Archiviati"
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:131
msgid "Suggest new connections"
msgstr "Suggerisci nuovi contatti"
-#: ../../mod/connections.php:274
+#: ../../mod/connections.php:134
msgid "New Connections"
msgstr "Nuovi contatti"
-#: ../../mod/connections.php:277
+#: ../../mod/connections.php:137
msgid "Show pending (new) connections"
msgstr "Richieste di contatto in attesa"
-#: ../../mod/connections.php:280 ../../mod/profperm.php:139
+#: ../../mod/connections.php:140 ../../mod/profperm.php:139
msgid "All Connections"
msgstr "Tutti i contatti"
-#: ../../mod/connections.php:283
+#: ../../mod/connections.php:143
msgid "Show all connections"
msgstr "Mostra tutti i contatti"
-#: ../../mod/connections.php:286
+#: ../../mod/connections.php:146
msgid "Unblocked"
msgstr "Non bloccati"
-#: ../../mod/connections.php:289
+#: ../../mod/connections.php:149
msgid "Only show unblocked connections"
msgstr "Mostra solo i contatti non bloccati"
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:156
msgid "Only show blocked connections"
msgstr "Mostra solo i contatti bloccati"
-#: ../../mod/connections.php:303
+#: ../../mod/connections.php:163
msgid "Only show ignored connections"
msgstr "Mostra solo i contatti ignorati"
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:170
msgid "Only show archived connections"
msgstr "Mostra solo i contatti archiviati"
-#: ../../mod/connections.php:317
+#: ../../mod/connections.php:177
msgid "Only show hidden connections"
msgstr "Mostra solo i contatti nascosti"
-#: ../../mod/connections.php:372
+#: ../../mod/connections.php:232
#, php-format
msgid "%1$s [%2$s]"
msgstr "%1$s [%2$s]"
-#: ../../mod/connections.php:373
+#: ../../mod/connections.php:233
msgid "Edit connection"
msgstr "Modifica il contatto"
-#: ../../mod/connections.php:411
+#: ../../mod/connections.php:271
msgid "Search your connections"
msgstr "Cerca tra i contatti"
-#: ../../mod/connections.php:412
+#: ../../mod/connections.php:272
msgid "Finding: "
msgstr "Ricerca: "
@@ -5132,42 +5120,42 @@ msgstr "Impossibile clonare il canale. L'importazione è fallita."
msgid "Cloned channel not found. Import failed."
msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
-#: ../../mod/import.php:516
+#: ../../mod/import.php:574
msgid "You must be logged in to use this feature."
msgstr "Per questa funzionalità devi aver effettuato l'accesso."
-#: ../../mod/import.php:521
+#: ../../mod/import.php:579
msgid "Import Channel"
msgstr "Importa un canale"
-#: ../../mod/import.php:522
+#: ../../mod/import.php:580
msgid ""
"Use this form to import an existing channel from a different server/hub. You"
" may retrieve the channel identity from the old server/hub via the network "
"or provide an export file."
msgstr "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file esportato in precedenza."
-#: ../../mod/import.php:523
+#: ../../mod/import.php:581
msgid "File to Upload"
msgstr "File da caricare"
-#: ../../mod/import.php:524
+#: ../../mod/import.php:582
msgid "Or provide the old server/hub details"
msgstr "Oppure fornisci i dettagli del vecchio server/hub"
-#: ../../mod/import.php:525
+#: ../../mod/import.php:583
msgid "Your old identity address (xyz@example.com)"
msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"
-#: ../../mod/import.php:526
+#: ../../mod/import.php:584
msgid "Your old login email address"
msgstr "L'email che usavi per accedere sul vecchio server"
-#: ../../mod/import.php:527
+#: ../../mod/import.php:585
msgid "Your old login password"
msgstr "La password per il vecchio server"
-#: ../../mod/import.php:528
+#: ../../mod/import.php:586
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be"
@@ -5175,17 +5163,17 @@ msgid ""
"primary location for files, photos, and media."
msgstr "Scegli se vuoi spostare il tuo indirizzo primario su questo server, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i server, ma solamente uno sarà indicato come posizione in cui risiedono i tuoi file, foto, ecc."
-#: ../../mod/import.php:529
+#: ../../mod/import.php:587
msgid "Make this hub my primary location"
msgstr "Rendi questo server il mio indirizzo primario"
-#: ../../mod/import.php:530
+#: ../../mod/import.php:588
msgid ""
"Import existing posts if possible (experimental - limited by available "
"memory"
msgstr "Importa i contenuti pubblicati, se possibile (sperimentale)"
-#: ../../mod/import.php:531
+#: ../../mod/import.php:589
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
@@ -5222,7 +5210,7 @@ msgstr "Lascia l'area chat"
#: ../../mod/chat.php:179
msgid "Delete This Room"
-msgstr "Elimina questa area chat"
+msgstr "Elimina questa chat"
#: ../../mod/chat.php:180
msgid "I am away right now"
@@ -5393,7 +5381,7 @@ msgstr "Nessun account valido trovato."
msgid "Password reset request issued. Check your email."
msgstr "La richiesta per reimpostare la password è stata inviata. Controlla la tua email."
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
#, php-format
msgid "Site Member (%s)"
msgstr "Utente del sito (%s)"
@@ -5409,52 +5397,52 @@ msgid ""
"Password reset failed."
msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata."
-#: ../../mod/lostpass.php:85 ../../boot.php:1559
+#: ../../mod/lostpass.php:86 ../../boot.php:1559
msgid "Password Reset"
msgstr "Reimposta la password"
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
msgid "Your password has been reset as requested."
msgstr "La password è stata reimpostata come richiesto."
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
msgid "Your new password is"
msgstr "La tua nuova password è"
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:89
msgid "Save or copy your new password - and then"
msgstr "Salva o copia la tua nuova password, quindi"
-#: ../../mod/lostpass.php:89
+#: ../../mod/lostpass.php:90
msgid "click here to login"
msgstr "clicca qui per accedere"
-#: ../../mod/lostpass.php:90
+#: ../../mod/lostpass.php:91
msgid ""
"Your password may be changed from the Settings page after "
"successful login."
msgstr "Puoi cambiare la tua password dalla pagina delle Impostazioni dopo aver effettuato l'accesso."
-#: ../../mod/lostpass.php:107
+#: ../../mod/lostpass.php:108
#, php-format
msgid "Your password has changed at %s"
msgstr "La tua password su %s è cambiata"
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:123
msgid "Forgot your Password?"
msgstr "Hai dimenticato la password?"
-#: ../../mod/lostpass.php:123
+#: ../../mod/lostpass.php:124
msgid ""
"Enter your email address and submit to have your password reset. Then check "
"your email for further instructions."
msgstr "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare."
-#: ../../mod/lostpass.php:124
+#: ../../mod/lostpass.php:125
msgid "Email Address"
msgstr "Indirizzo email"
-#: ../../mod/lostpass.php:125
+#: ../../mod/lostpass.php:126
msgid "Reset"
msgstr "Reimposta"
@@ -6546,11 +6534,11 @@ msgstr "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo."
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
-#: ../../mod/uexport.php:41 ../../mod/uexport.php:42
+#: ../../mod/uexport.php:45 ../../mod/uexport.php:46
msgid "Export Channel"
msgstr "Esporta il canale"
-#: ../../mod/uexport.php:43
+#: ../../mod/uexport.php:47
msgid ""
"Export your basic channel information to a small file. This acts as a "
"backup of your connections, permissions, profile and basic data, which can "
@@ -6558,11 +6546,11 @@ msgid ""
"content."
msgstr "Esporta le informazioni di base del tuo canale in un piccolo file. E' utile per avere un salvataggio di sicurezza dei tuoi contatti, del tuo profilo ed altre informazioni fondamentali. Può essere usato per importare il tuo canale su un nuovo server, ma non include i contenuti, per esempio post e foto."
-#: ../../mod/uexport.php:44
+#: ../../mod/uexport.php:48
msgid "Export Content"
msgstr "Esporta i contenuti"
-#: ../../mod/uexport.php:45
+#: ../../mod/uexport.php:49
msgid ""
"Export your channel information and all the content to a JSON backup. This "
"backs up all of your connections, permissions, profile data and all of your "
@@ -7084,31 +7072,36 @@ msgstr "Ultimo scambio dati"
#: ../../mod/admin.php:683
#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s utente bloccato/sbloccato"
-msgstr[1] "%s utenti bloccati/sbloccati"
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] "Modificato il blocco su %s account"
+msgstr[1] "Modificato il blocco verso %s"
#: ../../mod/admin.php:691
#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s utente cancellato"
-msgstr[1] "%s utenti cancellati"
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] "%s account eliminato"
+msgstr[1] "%s account eliminati"
#: ../../mod/admin.php:727
msgid "Account not found"
msgstr "Account non trovato"
+#: ../../mod/admin.php:739
+#, php-format
+msgid "Account '%s' deleted"
+msgstr "Account '%s' eliminato"
+
#: ../../mod/admin.php:747
#, php-format
-msgid "User '%s' blocked"
-msgstr "Utente '%s' bloccato"
+msgid "Account '%s' blocked"
+msgstr "Aggiunto un blocco verso '%s'"
#: ../../mod/admin.php:755
#, php-format
-msgid "User '%s' unblocked"
-msgstr "Utente '%s' sbloccato"
+msgid "Account '%s' unblocked"
+msgstr "Rimosso il blocco verso '%s'"
#: ../../mod/admin.php:818 ../../mod/admin.php:830
msgid "Users"
@@ -7130,7 +7123,7 @@ msgstr "Data richiesta"
msgid "No registrations."
msgstr "Nessuna registrazione."
-#: ../../mod/admin.php:824 ../../mod/connedit.php:687
+#: ../../mod/admin.php:824 ../../mod/connedit.php:699
msgid "Approve"
msgstr "Approva"
@@ -7138,11 +7131,11 @@ msgstr "Approva"
msgid "Deny"
msgstr "Nega"
-#: ../../mod/admin.php:827 ../../mod/connedit.php:519
+#: ../../mod/admin.php:827 ../../mod/connedit.php:531
msgid "Block"
msgstr "Blocca"
-#: ../../mod/admin.php:828 ../../mod/connedit.php:519
+#: ../../mod/admin.php:828 ../../mod/connedit.php:531
msgid "Unblock"
msgstr "Sblocca"
@@ -7164,15 +7157,15 @@ msgstr "Classe dell'account"
#: ../../mod/admin.php:833
msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
+" on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Gli account selezionati saranno eliminati!\\n\\nTutto ciò che hanno caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
#: ../../mod/admin.php:834
msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "L'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "L'account {0} sarà eliminato!\\n\\nTutto ciò che ha caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
#: ../../mod/admin.php:870
#, php-format
@@ -8214,220 +8207,236 @@ msgid ""
"removed from the network"
msgstr "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni"
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "Non è possibile accedere alle informazioni sul contatto."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "Non riesco a trovare il profilo selezionato."
+
+#: ../../mod/connedit.php:219
+msgid "Connection updated."
+msgstr "Contatto aggiornato."
+
+#: ../../mod/connedit.php:221
+msgid "Failed to update connection record."
+msgstr "Impossibile aggiornare le informazioni del contatto."
+
#: ../../mod/connedit.php:267
msgid "is now connected to"
msgstr "ha come nuovo contatto"
-#: ../../mod/connedit.php:380
+#: ../../mod/connedit.php:392
msgid "Could not access address book record."
msgstr "Impossibile accedere alle informazioni della rubrica."
-#: ../../mod/connedit.php:394
+#: ../../mod/connedit.php:406
msgid "Refresh failed - channel is currently unavailable."
msgstr "Il canale non è disponibile - impossibile aggiornare."
-#: ../../mod/connedit.php:406 ../../mod/connedit.php:418
-#: ../../mod/connedit.php:430 ../../mod/connedit.php:442
-#: ../../mod/connedit.php:458
+#: ../../mod/connedit.php:418 ../../mod/connedit.php:430
+#: ../../mod/connedit.php:442 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:470
msgid "Unable to set address book parameters."
msgstr "Impossibile impostare i parametri della rubrica."
-#: ../../mod/connedit.php:482
+#: ../../mod/connedit.php:494
msgid "Connection has been removed."
msgstr "Il contatto è stato rimosso."
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:513
#, php-format
msgid "View %s's profile"
msgstr "Guarda il profilo di %s"
-#: ../../mod/connedit.php:505
+#: ../../mod/connedit.php:517
msgid "Refresh Permissions"
msgstr "Modifica i permessi"
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:520
msgid "Fetch updated permissions"
msgstr "Guarda e modifica i permessi assegnati"
-#: ../../mod/connedit.php:512
+#: ../../mod/connedit.php:524
msgid "Recent Activity"
msgstr "Attività recenti"
-#: ../../mod/connedit.php:515
+#: ../../mod/connedit.php:527
msgid "View recent posts and comments"
msgstr "Leggi i post recenti e i commenti"
-#: ../../mod/connedit.php:522
+#: ../../mod/connedit.php:534
msgid "Block (or Unblock) all communications with this connection"
msgstr "Blocca ogni interazione con questo contatto (abilita/disabilita)"
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:535
msgid "This connection is blocked!"
msgstr "Questa connessione è tra quelle bloccate!"
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:539
msgid "Unignore"
msgstr "Non ignorare"
-#: ../../mod/connedit.php:527 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:539 ../../mod/notifications.php:51
msgid "Ignore"
msgstr "Ignora"
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:542
msgid "Ignore (or Unignore) all inbound communications from this connection"
msgstr "Ignora tutte le comunicazioni in arrivo da questo contatto (abilita/disabilita)"
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:543
msgid "This connection is ignored!"
msgstr "Questa connessione è tra quelle ignorate!"
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:547
msgid "Unarchive"
msgstr "Non archiviare"
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:547
msgid "Archive"
msgstr "Archivia"
-#: ../../mod/connedit.php:538
+#: ../../mod/connedit.php:550
msgid ""
"Archive (or Unarchive) this connection - mark channel dead but keep content"
msgstr "Archivia questo contatto (abilita/disabilita) - segna il canale come non più attivo ma ne conserva i contenuti"
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:551
msgid "This connection is archived!"
msgstr "Questa connessione è tra quelle archiviate!"
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:555
msgid "Unhide"
msgstr "Non nascondere"
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:555
msgid "Hide"
msgstr "Nascondi"
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:558
msgid "Hide or Unhide this connection from your other connections"
msgstr "Nascondi questo contatto a tutti gli altri (abilita/disabilita)"
-#: ../../mod/connedit.php:547
+#: ../../mod/connedit.php:559
msgid "This connection is hidden!"
msgstr "Questa connessione è tra quelle nascoste!"
-#: ../../mod/connedit.php:554
+#: ../../mod/connedit.php:566
msgid "Delete this connection"
msgstr "Elimina questo contatto"
-#: ../../mod/connedit.php:635
+#: ../../mod/connedit.php:647
msgid "Approve this connection"
msgstr "Approva questo contatto"
-#: ../../mod/connedit.php:635
+#: ../../mod/connedit.php:647
msgid "Accept connection to allow communication"
msgstr "Entra in contatto per poter comunicare"
-#: ../../mod/connedit.php:640
+#: ../../mod/connedit.php:652
msgid "Set Affinity"
msgstr "Scegli l'affinità"
-#: ../../mod/connedit.php:643
+#: ../../mod/connedit.php:655
msgid "Set Profile"
msgstr "Scegli il profilo da mostrare"
-#: ../../mod/connedit.php:646
+#: ../../mod/connedit.php:658
msgid "Set Affinity & Profile"
msgstr "Affinità e profilo"
-#: ../../mod/connedit.php:663
+#: ../../mod/connedit.php:675
msgid "Apply these permissions automatically"
msgstr "Applica automaticamente questi permessi"
-#: ../../mod/connedit.php:665
+#: ../../mod/connedit.php:677
msgid "This connection's address is"
msgstr "Indirizzo di questo contatto"
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:680
msgid ""
"The permissions indicated on this page will be applied to all new "
"connections."
msgstr "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi."
-#: ../../mod/connedit.php:670
+#: ../../mod/connedit.php:682
msgid "Slide to adjust your degree of friendship"
msgstr "Trascina per restringere il grado di amicizia da mostrare"
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:684
msgid "Slide to adjust your rating"
msgstr "Trascina per cambiare la tua valutazione"
-#: ../../mod/connedit.php:673 ../../mod/connedit.php:678
+#: ../../mod/connedit.php:685 ../../mod/connedit.php:690
msgid "Optionally explain your rating"
msgstr "Commento opzionale"
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:687
msgid "Custom Filter"
msgstr "Filtro personalizzato"
-#: ../../mod/connedit.php:676
+#: ../../mod/connedit.php:688
msgid "Only import posts with this text"
msgstr "Importa solo i post che contengono questo testo"
-#: ../../mod/connedit.php:676 ../../mod/connedit.php:677
+#: ../../mod/connedit.php:688 ../../mod/connedit.php:689
msgid ""
"words one per line or #tags or /patterns/, leave blank to import all posts"
msgstr "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto"
-#: ../../mod/connedit.php:677
+#: ../../mod/connedit.php:689
msgid "Do not import posts with this text"
msgstr "Non importare i post con questo testo"
-#: ../../mod/connedit.php:679
+#: ../../mod/connedit.php:691
msgid "This information is public!"
msgstr "Questa informazione è pubblica!"
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:696
msgid "Connection Pending Approval"
msgstr "Contatti in attesa di approvazione"
-#: ../../mod/connedit.php:685
+#: ../../mod/connedit.php:697
msgid "Connection Request"
msgstr "Richiesta di entrare in contatto"
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:698
#, php-format
msgid ""
"(%s) would like to connect with you. Please approve this connection to allow"
" communication."
msgstr "(%s) vorrebbe entrare in contatto con te. Per permettere la comunicazione è necessario che tu approvi."
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:700
msgid "Approve Later"
msgstr "Approva più tardi"
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:703
msgid "inherited"
msgstr "derivato"
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:705
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:707
msgid "Their Settings"
msgstr "Permessi concessi a te"
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:708
msgid "My Settings"
msgstr "I permessi che concedo"
-#: ../../mod/connedit.php:698
+#: ../../mod/connedit.php:710
msgid "Individual Permissions"
msgstr "Permessi individuali"
-#: ../../mod/connedit.php:699
+#: ../../mod/connedit.php:711
msgid ""
"Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -8435,7 +8444,7 @@ msgid ""
" settings here."
msgstr "Alcuni permessi derivano dalle impostazioni di privacy del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Da questa pagina non puoi cambiarle."
-#: ../../mod/connedit.php:700
+#: ../../mod/connedit.php:712
msgid ""
"Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -8443,7 +8452,7 @@ msgid ""
"they wont have any impact unless the inherited setting changes."
msgstr "Alcuni permessi derivano dalle impostazioni di privacy del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Le personalizzazioni che effettuerai qui potrebbero non essere effettive a meno che tu non cambi proprio le impostazioni generali."
-#: ../../mod/connedit.php:701
+#: ../../mod/connedit.php:713
msgid "Last update:"
msgstr "Ultimo aggiornamento:"
@@ -8715,7 +8724,7 @@ msgid ""
"Warning: Changing some settings could render your channel inoperable. Please"
" leave this page unless you are comfortable with and knowledgeable about how"
" to correctly use this feature."
-msgstr "Avviso: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."
+msgstr "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."
#: ../../mod/suggest.php:35
msgid ""
diff --git a/view/it/strings.php b/view/it/strings.php
index f54b03520..f7293eebd 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -903,7 +903,7 @@ $a->strings["Purchase"] = "Acquista";
$a->strings["Image/photo"] = "Immagine";
$a->strings["Encrypted content"] = "Contenuto crittografato";
$a->strings["Install %s element: "] = "Installa l'elemento %s:";
-$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari.";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari per l'installazione.";
$a->strings["webpage"] = "pagina web";
$a->strings["layout"] = "layout";
$a->strings["block"] = "riquadro";
@@ -1046,6 +1046,7 @@ $a->strings["Create New Event"] = "Crea un nuovo evento";
$a->strings["Previous"] = "Precendente";
$a->strings["Next"] = "Successivo";
$a->strings["Export"] = "Esporta";
+$a->strings["Import"] = "Importa";
$a->strings["Event removed"] = "Evento eliminato";
$a->strings["Failed to remove event"] = "Impossibile eliminare l'evento";
$a->strings["Event details"] = "Dettagli evento";
@@ -1114,10 +1115,6 @@ $a->strings["No channel."] = "Nessun canale.";
$a->strings["Common connections"] = "Contatti in comune";
$a->strings["No connections in common."] = "Nessun contatto in comune.";
$a->strings["This site is not a directory server"] = "Questo sito non è un server di elenchi pubblici";
-$a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
-$a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
-$a->strings["Connection updated."] = "Contatto aggiornato.";
-$a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto.";
$a->strings["Blocked"] = "Bloccati";
$a->strings["Ignored"] = "Ignorati";
$a->strings["Hidden"] = "Nascosti";
@@ -1231,7 +1228,7 @@ $a->strings["Edit Layout"] = "Modifica il layout";
$a->strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina.";
$a->strings["Room not found"] = "Area chat non trovata";
$a->strings["Leave Room"] = "Lascia l'area chat";
-$a->strings["Delete This Room"] = "Elimina questa area chat";
+$a->strings["Delete This Room"] = "Elimina questa chat";
$a->strings["I am away right now"] = "Non sono presente";
$a->strings["I am online"] = "Sono online";
$a->strings["Bookmark this room"] = "Aggiungi l'area chat ai segnalibri";
@@ -1662,17 +1659,18 @@ $a->strings["Destination URL"] = "URL di destinazione";
$a->strings["Mark hub permanently offline"] = "Questo hub è definitivamente offline";
$a->strings["Empty queue for this hub"] = "Svuota la coda per questo hub";
$a->strings["Last known contact"] = "Ultimo scambio dati";
-$a->strings["%s user blocked/unblocked"] = array(
- 0 => "%s utente bloccato/sbloccato",
- 1 => "%s utenti bloccati/sbloccati",
+$a->strings["%s account blocked/unblocked"] = array(
+ 0 => "Modificato il blocco su %s account",
+ 1 => "Modificato il blocco verso %s",
);
-$a->strings["%s user deleted"] = array(
- 0 => "%s utente cancellato",
- 1 => "%s utenti cancellati",
+$a->strings["%s account deleted"] = array(
+ 0 => "%s account eliminato",
+ 1 => "%s account eliminati",
);
$a->strings["Account not found"] = "Account non trovato";
-$a->strings["User '%s' blocked"] = "Utente '%s' bloccato";
-$a->strings["User '%s' unblocked"] = "Utente '%s' sbloccato";
+$a->strings["Account '%s' deleted"] = "Account '%s' eliminato";
+$a->strings["Account '%s' blocked"] = "Aggiunto un blocco verso '%s'";
+$a->strings["Account '%s' unblocked"] = "Rimosso il blocco verso '%s'";
$a->strings["Users"] = "Utenti";
$a->strings["select all"] = "seleziona tutti";
$a->strings["User registrations waiting for confirm"] = "Richieste di registrazione in attesa di conferma";
@@ -1686,8 +1684,8 @@ $a->strings["Register date"] = "Data registrazione";
$a->strings["Last login"] = "Ultimo accesso";
$a->strings["Expires"] = "Con scadenza";
$a->strings["Service Class"] = "Classe dell'account";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?";
+$a->strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Gli account selezionati saranno eliminati!\\n\\nTutto ciò che hanno caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?";
+$a->strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'account {0} sarà eliminato!\\n\\nTutto ciò che ha caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?";
$a->strings["%s channel censored/uncensored"] = array(
0 => "Censura modificata per %s canale",
1 => "Censura modificata per %s canali",
@@ -1943,6 +1941,10 @@ $a->strings["Remove This Channel"] = "Elimina questo canale";
$a->strings["This channel will be completely removed from the network. "] = "Questo canale sarà completamente eliminato dalla rete.";
$a->strings["Remove this channel and all its clones from the network"] = "Rimuovi questo canale e tutti i suoi cloni dalla rete";
$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni";
+$a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
+$a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
+$a->strings["Connection updated."] = "Contatto aggiornato.";
+$a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto.";
$a->strings["is now connected to"] = "ha come nuovo contatto";
$a->strings["Could not access address book record."] = "Impossibile accedere alle informazioni della rubrica.";
$a->strings["Refresh failed - channel is currently unavailable."] = "Il canale non è disponibile - impossibile aggiornare.";
@@ -2058,7 +2060,7 @@ $a->strings["My Connections Bookmarks"] = "I segnalibri dei miei contatti";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
$a->strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
$a->strings["Configuration Editor"] = "Editor di configurazione";
-$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Avviso: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nessun suggerimento disponibile. Se questo sito è nuovo, riprova tra 24 ore.";
$a->strings["Poll"] = "Sondaggio";
$a->strings["View Results"] = "Guarda i risultati";
--
cgit v1.2.3
From 6711ceb662a997d4f44743266a792ec762790d05 Mon Sep 17 00:00:00 2001
From: Habeas Codice
Date: Mon, 7 Sep 2015 16:28:42 -0700
Subject: fix postgres zotfeed
---
include/items.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/items.php b/include/items.php
index 01b4a3460..981f52d7a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4588,10 +4588,12 @@ function zot_feed($uid,$observer_hash,$arr) {
$items = array();
- /** @FIXME fix this part for PostgreSQL */
+ /** @FIXME re-unite these SQL statements. There is no need for them to be separate. The mySQL is convoluted with misuse of group by. As it stands, there is a slight difference where the postgres version doesn't remove the duplicate parents up to 100. In practice this doesn't matter. It could be made to match behavior by adding "distinct on (parent) " to the front of the selection list, at a not-worth-it performance penalty (page temp results to disk). duplicates are still ignored in the in() clause, you just get less than 100 parents if there are many children. */
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
- return array();
+ $groupby = '';
+ } else {
+ $groupby = 'GROUP BY parent';
}
if(is_sys_channel($uid)) {
@@ -4599,7 +4601,7 @@ function zot_feed($uid,$observer_hash,$arr) {
WHERE uid != %d
AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
AND (item_flags & %d) > 0
- $sql_extra GROUP BY parent ORDER BY created ASC $limit",
+ $sql_extra $groupby ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);
@@ -4608,7 +4610,7 @@ function zot_feed($uid,$observer_hash,$arr) {
$r = q("SELECT parent, created, postopts from item
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) > 0
- $sql_extra GROUP BY parent ORDER BY created ASC $limit",
+ $sql_extra $groupby ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);
--
cgit v1.2.3
From 9fa0490c4494b4c01f6b2bb84cb0915562127fe4 Mon Sep 17 00:00:00 2001
From: redmatrix
Date: Mon, 7 Sep 2015 18:11:30 -0700
Subject: sync posted top level items rather than deliver them (actually we do
both, but sync comes first). This way we get the ACL transferred.
---
mod/item.php | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/mod/item.php b/mod/item.php
index bc2710b42..bff312cfe 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -823,6 +823,19 @@ function item_post(&$a) {
update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
+ if(! $parent) {
+ $r = q("select * from item where id = %d",
+ intval($post_id)
+ );
+ if($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ $rid = q("select * from item_id where iid = %d",
+ intval($post_id)
+ );
+ build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
+ }
+ }
if(! $nopush)
proc_run('php', "include/notifier.php", 'edit_post', $post_id);
@@ -903,14 +916,28 @@ function item_post(&$a) {
// NOTREACHED
}
- if($parent) {
+
+ update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
+
+ if(($parent) && ($parent != $post_id)) {
// Store the comment signature information in case we need to relay to Diaspora
$ditem = $datarray;
$ditem['author'] = $observer;
store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0));
}
-
- update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
+ else {
+ $r = q("select * from item where id = %d",
+ intval($post_id)
+ );
+ if($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ $rid = q("select * from item_id where iid = %d",
+ intval($post_id)
+ );
+ build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
+ }
+ }
$datarray['id'] = $post_id;
$datarray['llink'] = $a->get_baseurl() . '/display/' . $channel['channel_address'] . '/' . $post_id;
--
cgit v1.2.3
From 6d1b64065aa1f44e2b9d864ddba97891ca85d1e5 Mon Sep 17 00:00:00 2001
From: redmatrix
Date: Mon, 7 Sep 2015 18:14:30 -0700
Subject: consolidate import_items/sync_items
---
include/import.php | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/photos.php | 3 --
include/zot.php | 6 ++++
mod/import.php | 54 +++---------------------------------
mod/import_items.php | 49 ++-------------------------------
mod/item.php | 25 +++++++++++++++--
6 files changed, 112 insertions(+), 102 deletions(-)
diff --git a/include/import.php b/include/import.php
index 261219ce0..a81ade791 100644
--- a/include/import.php
+++ b/include/import.php
@@ -473,3 +473,80 @@ function sync_chatrooms($channel,$chatrooms) {
}
}
}
+
+
+
+function import_items($channel,$items) {
+
+ if($channel && $items) {
+ foreach($items as $i) {
+ $item = get_item_elements($i);
+ if(! $item)
+ continue;
+
+ $r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
+ dbesc($item['mid']),
+ intval($channel['channel_id'])
+ );
+ if($r) {
+ if($item['edited'] > $r[0]['edited']) {
+ $item['id'] = $r[0]['id'];
+ $item['uid'] = $channel['channel_id'];
+ item_store_update($item);
+ continue;
+ }
+ }
+ else {
+ $item['aid'] = $channel['channel_account_id'];
+ $item['uid'] = $channel['channel_id'];
+ $item_result = item_store($item);
+ }
+
+ }
+ }
+}
+
+
+function sync_items($channel,$items) {
+ import_items($channel,$items);
+}
+
+
+
+function import_item_ids($channel,$itemids) {
+ if($channel && $itemids) {
+ foreach($itemids as $i) {
+ $r = q("select id from item where mid = '%s' and uid = %d limit 1",
+ dbesc($i['mid']),
+ intval($channel['channel_id'])
+ );
+ if(! $r)
+ continue;
+ $z = q("select * from item_id where service = '%s' and sid = '%s' and iid = %d and uid = %d limit 1",
+ dbesc($i['service']),
+ dbesc($i['sid']),
+ intval($r[0]['id']),
+ intval($channel['channel_id'])
+ );
+ if(! $z) {
+ q("insert into item_id (iid,uid,sid,service) values(%d,%d,'%s','%s')",
+ intval($r[0]['id']),
+ intval($channel['channel_id']),
+ dbesc($i['sid']),
+ dbesc($i['service'])
+ );
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/include/photos.php b/include/photos.php
index 25818124a..49aab6865 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -226,11 +226,8 @@ function photo_upload($channel, $observer, $args) {
$width_x_height = $ph->getWidth() . 'x' . $ph->getHeight();
- $mid = item_message_id();
-
// Create item container
-
$item_hidden = (($visible) ? 0 : 1 );
$lat = $lon = null;
diff --git a/include/zot.php b/include/zot.php
index 9610df894..6f159b4f8 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2884,6 +2884,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
sync_apps($channel,$arr['chatroom']);
+ if(array_key_exists('item',$arr) && $arr['item'])
+ sync_items($channel,$arr['item']);
+
+ if(array_key_exists('item_id',$arr) && $arr['item_id'])
+ sync_items($channel,$arr['item_id']);
+
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
if(array_key_exists('channel_page_flags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
$arr['channel']['channel_removed'] = (($arr['channel']['channel_pageflags'] & 0x8000) ? 1 : 0);
diff --git a/mod/import.php b/mod/import.php
index 1d1799e00..13d684f6e 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -440,60 +440,14 @@ function import_post(&$a) {
$saved_notification_flags = notifications_off($channel['channel_id']);
- if($import_posts && array_key_exists('item',$data) && $data['item']) {
-
- foreach($data['item'] as $i) {
- $item = get_item_elements($i);
-
- $r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
- dbesc($item['mid']),
- intval($channel['channel_id'])
- );
- if($r) {
- if($item['edited'] > $r[0]['edited']) {
- $item['id'] = $r[0]['id'];
- $item['uid'] = $channel['channel_id'];
- item_store_update($item);
- continue;
- }
- }
- else {
- $item['aid'] = $channel['channel_account_id'];
- $item['uid'] = $channel['channel_id'];
- $item_result = item_store($item);
- }
-
- }
-
- }
+ if($import_posts && array_key_exists('item',$data) && $data['item'])
+ import_items($channel,$data['item']);
notifications_on($channel['channel_id'],$saved_notification_flags);
- if(array_key_exists('item_id',$data) && $data['item_id']) {
- foreach($data['item_id'] as $i) {
- $r = q("select id from item where mid = '%s' and uid = %d limit 1",
- dbesc($i['mid']),
- intval($channel['channel_id'])
- );
- if(! $r)
- continue;
- $z = q("select * from item_id where service = '%s' and sid = '%s' and iid = %d and uid = %d limit 1",
- dbesc($i['service']),
- dbesc($i['sid']),
- intval($r[0]['id']),
- intval($channel['channel_id'])
- );
- if(! $z) {
- q("insert into item_id (iid,uid,sid,service) values(%d,%d,'%s','%s')",
- intval($r[0]['id']),
- intval($channel['channel_id']),
- dbesc($i['sid']),
- dbesc($i['service'])
- );
- }
- }
- }
+ if(array_key_exists('item_id',$data) && $data['item_id'])
+ import_item_ids($channel,$data['item_id']);
// FIXME - ensure we have a self entry if somebody is trying to pull a fast one
diff --git a/mod/import_items.php b/mod/import_items.php
index 1e54c0deb..6b97939c9 100644
--- a/mod/import_items.php
+++ b/mod/import_items.php
@@ -1,5 +1,6 @@
$r[0]['edited']) {
- $item['id'] = $r[0]['id'];
- $item['uid'] = $channel['channel_id'];
- item_store_update($item);
- continue;
- }
- }
- else {
- $item['aid'] = $channel['channel_account_id'];
- $item['uid'] = $channel['channel_id'];
- $item_result = item_store($item);
- }
-
- }
-
+ import_items($channel,$data['item']);
}
notifications_on($channel['channel_id'],$saved_notification_flags);
if(array_key_exists('item_id',$data) && $data['item_id']) {
- foreach($data['item_id'] as $i) {
- $r = q("select id from item where mid = '%s' and uid = %d limit 1",
- dbesc($i['mid']),
- intval($channel['channel_id'])
- );
- if(! $r)
- continue;
- $z = q("select * from item_id where service = '%s' and sid = '%s' and iid = %d and uid = %d limit 1",
- dbesc($i['service']),
- dbesc($i['sid']),
- intval($r[0]['id']),
- intval($channel['channel_id'])
- );
- if(! $z) {
- q("insert into item_id (iid,uid,sid,service) values(%d,%d,'%s','%s')",
- intval($r[0]['id']),
- intval($channel['channel_id']),
- dbesc($i['sid']),
- dbesc($i['service'])
- );
- }
- }
+ import_item_ids($channel,$data['item_id']);
}
info( t('Import completed') . EOL);
diff --git a/mod/item.php b/mod/item.php
index c93560771..a92040627 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -884,14 +884,28 @@ function item_post(&$a) {
// NOTREACHED
}
- if($parent) {
+
+ update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
+
+ if(($parent) && ($parent != $post_id)) {
// Store the comment signature information in case we need to relay to Diaspora
$ditem = $datarray;
$ditem['author'] = $observer;
store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0));
}
-
- update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
+ else {
+ $r = q("select * from item where id = %d",
+ intval($post_id)
+ );
+ if($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ $rid = q("select * from item_id where iid = %d",
+ intval($post_id)
+ );
+ build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
+ }
+ }
$datarray['id'] = $post_id;
$datarray['llink'] = $a->get_baseurl() . '/display/' . $channel['channel_address'] . '/' . $post_id;
@@ -903,6 +917,11 @@ function item_post(&$a) {
logger('post_complete');
+
+
+
+
+
// figure out how to return, depending on from whence we came
if($api_source)
--
cgit v1.2.3
From c39e3613a8facf0ef626fbd671f21f822ff25096 Mon Sep 17 00:00:00 2001
From: redmatrix
Date: Mon, 7 Sep 2015 20:28:02 -0700
Subject: create event sync packets
---
include/event.php | 14 ++++++++++++++
mod/events.php | 19 +++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/include/event.php b/include/event.php
index 134c23aa2..3b48837f1 100644
--- a/include/event.php
+++ b/include/event.php
@@ -376,6 +376,20 @@ function event_addtocal($item_id, $uid) {
intval($channel['channel_id'])
);
+ $item['resource_id'] = $event['event_hash'];
+ $item['resource_type'] = 'event';
+
+ $i = array($item);
+ xchan_query($i);
+ $sync_item = fetch_post_tags($i);
+ $z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
+ dbesc($event['event_hash']),
+ intval($channel['channel_id'])
+ );
+ if($z) {
+ build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
+ }
+
return true;
}
}
diff --git a/mod/events.php b/mod/events.php
index 9c94d433d..1e4fef73c 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -219,6 +219,19 @@ function events_post(&$a) {
$item_id = event_store_item($datarray,$event);
+ if($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ $z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
+ dbesc($r[0]['resource_id']),
+ intval($channel['channel_id'])
+ );
+ if($z) {
+ build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
+ }
+ }
+
+
if($share)
proc_run('php',"include/notifier.php","event","$item_id");
@@ -505,6 +518,9 @@ function events_content(&$a) {
dbesc($event_id),
intval(local_channel())
);
+
+ $sync_event = $r[0];
+
if($r) {
$r = q("delete from event where event_hash = '%s' and uid = %d limit 1",
dbesc($event_id),
@@ -515,6 +531,9 @@ function events_content(&$a) {
dbesc($event_id),
intval(local_channel())
);
+ $sync_event['event_deleted'] = 1;
+ build_sync_packet(0,array('event' => array($sync_event)));
+
info( t('Event removed') . EOL);
}
else {
--
cgit v1.2.3
From f84946c135412f59c13c15fa9c3292bc74098f92 Mon Sep 17 00:00:00 2001
From: redmatrix
Date: Mon, 7 Sep 2015 21:00:54 -0700
Subject: minor fix to event sync
---
mod/events.php | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/mod/events.php b/mod/events.php
index 1e4fef73c..640020738 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -219,19 +219,23 @@ function events_post(&$a) {
$item_id = event_store_item($datarray,$event);
- if($r) {
- xchan_query($r);
- $sync_item = fetch_post_tags($r);
- $z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
- dbesc($r[0]['resource_id']),
- intval($channel['channel_id'])
+ if($item_id) {
+ $r = q("select * from item where id = %d",
+ intval($item_id)
);
- if($z) {
- build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
+ if($r) {
+ xchan_query($r);
+ $sync_item = fetch_post_tags($r);
+ $z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
+ dbesc($r[0]['resource_id']),
+ intval($channel['channel_id'])
+ );
+ if($z) {
+ build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
+ }
}
}
-
if($share)
proc_run('php',"include/notifier.php","event","$item_id");
--
cgit v1.2.3
From 650e98b2a9aff2f54be84782ac48cc57badbf76f Mon Sep 17 00:00:00 2001
From: redmatrix
Date: Mon, 7 Sep 2015 21:01:49 -0700
Subject: work on event sync
---
include/import.php | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
include/zot.php | 8 +++++-
mod/import.php | 7 +++++
3 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/include/import.php b/include/import.php
index a81ade791..616ee4987 100644
--- a/include/import.php
+++ b/include/import.php
@@ -540,6 +540,81 @@ function import_item_ids($channel,$itemids) {
}
}
+function import_events($channel,$events) {
+
+ if($channel && $events) {
+ foreach($events as $event) {
+ unset($event['id']);
+ $event['aid'] = $channel['channel_account_id'];
+ $event['uid'] = $channel['channel_id'];
+
+ dbesc_array($event);
+ $r = dbq("INSERT INTO event (`"
+ . implode("`, `", array_keys($event))
+ . "`) VALUES ('"
+ . implode("', '", array_values($event))
+ . "')"
+ );
+ }
+ }
+}
+
+
+function sync_events($channel,$events) {
+
+ if($channel && $events) {
+ foreach($events as $event) {
+
+ if((! $event['event_hash']) || (! $event['start']))
+ continue;
+
+ if($event['event_deleted']) {
+ $r = q("delete from event where event_hash = '%s' and uid = %d limit 1",
+ dbesc($event['event_hash']),
+ intval($channel['channel_id'])
+ );
+ continue;
+ }
+
+ unset($event['id']);
+ $event['aid'] = $channel['channel_account_id'];
+ $event['uid'] = $channel['channel_id'];
+
+ $exists = false;
+
+ $x = q("select * from event where event_hash = '%s' and uid = %d limit 1",
+ dbesc($event['event_hash']),
+ intval($channel['channel_id'])
+ );
+ if($x) {
+ if($x[0]['edited'] >= $event['edited'])
+ continue;
+ $exists = true;
+ }
+
+ if($exists) {
+ foreach($event as $k => $v) {
+ $r = q("UPDATE event SET `%s` = '%s' WHERE event_hash = '%s' AND uid = %d",
+ dbesc($k),
+ dbesc($v),
+ dbesc($event['event_hash']),
+ intval($channel['channel_id'])
+ );
+ }
+ }
+ else {
+ dbesc_array($event);
+ $r = dbq("INSERT INTO event (`"
+ . implode("`, `", array_keys($event))
+ . "`) VALUES ('"
+ . implode("', '", array_values($event))
+ . "')"
+ );
+ }
+ }
+ }
+}
+
diff --git a/include/zot.php b/include/zot.php
index 6f159b4f8..285668209 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2882,7 +2882,13 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
sync_apps($channel,$arr['app']);
if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
- sync_apps($channel,$arr['chatroom']);
+ sync_chatrooms($channel,$arr['chatroom']);
+
+ if(array_key_exists('event',$arr) && $arr['event'])
+ sync_events($channel,$arr['event']);
+
+ if(array_key_exists('event_item',$arr) && $arr['event_item'])
+ sync_items($channel,$arr['event_item']);
if(array_key_exists('item',$arr) && $arr['item'])
sync_items($channel,$arr['item']);
diff --git a/mod/import.php b/mod/import.php
index 13d684f6e..27c2094c3 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -438,6 +438,13 @@ function import_post(&$a) {
if(is_array($data['chatroom']))
import_chatrooms($channel,$data['chatroom']);
+ if(is_array($data['event']))
+ import_events($channel,$data['event']);
+
+ if(is_array($data['event_item']))
+ import_items($channel,$data['event_item']);
+
+
$saved_notification_flags = notifications_off($channel['channel_id']);
if($import_posts && array_key_exists('item',$data) && $data['item'])
--
cgit v1.2.3
From 11e19a06b74014cd62a26f127162ff1984159dce Mon Sep 17 00:00:00 2001
From: redmatrix
Date: Mon, 7 Sep 2015 22:54:43 -0700
Subject: export events
---
include/identity.php | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/include/identity.php b/include/identity.php
index 1a2a9c177..76079e93a 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -583,6 +583,25 @@ function identity_basic_export($channel_id, $items = false) {
if($r)
$ret['chatroom'] = $r;
+
+ $r = q("select * from event where uid = %d",
+ intval($channel_id)
+ );
+ if($r)
+ $ret['event'] = $r;
+
+ $r = q("select * from item where resource_type = 'event' and uid = %d",
+ intval($channel_id)
+ );
+ if($r) {
+ $ret['event_item'] = array();
+ xchan_query($r);
+ $r = fetch_post_tags($r,true);
+ foreach($r as $rr)
+ $ret['event_item'][] = encode_item($rr,true);
+ }
+
+
if(! $items)
return $ret;
--
cgit v1.2.3