Merge pull request #469 from tuscanhobbit/master

IT: strings fixed

1 files changed, 0 insertions, 1569 deletions

diff --git a/view/it/messages.po b/view/it/messages.po
index ccc8d7d1e..880a3ddf7 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,13 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2014-05-21 05:30-0300\n"
 "PO-Revision-Date: 2014-05-22 10:56+0000\n"
-=======
-"POT-Creation-Date: 2014-05-16 00:02-0700\n"
-"PO-Revision-Date: 2014-05-17 09:17+0000\n"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 "Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -32,43 +27,9 @@ msgstr ""
 msgid "Channel is blocked on this site."
 msgstr "Il canale è bloccato per questo sito."
 
-<<<<<<< HEAD
 #: ../../include/follow.php:28
 msgid "Channel location missing."
 msgstr "Manca l'indirizzo del canale."
-=======
-#: ../../include/apps.php:107 ../../include/nav.php:158
-msgid "Matrix"
-msgstr "La tua rete"
-
-#: ../../include/apps.php:107 ../../include/nav.php:161
-msgid "Channel Home"
-msgstr "Bacheca del canale"
-
-#: ../../include/apps.php:107 ../../include/identity.php:942
-#: ../../include/identity.php:1031 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profilo"
-
-#: ../../include/apps.php:108 ../../include/conversation.php:1501
-#: ../../include/nav.php:84 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr "Foto"
-
-#: ../../include/apps.php:108 ../../include/conversation.php:1532
-#: ../../include/nav.php:87 ../../include/nav.php:180 ../../mod/events.php:366
-msgid "Events"
-msgstr "Eventi"
-
-#: ../../include/apps.php:108 ../../include/nav.php:147
-#: ../../mod/directory.php:210
-msgid "Directory"
-msgstr "Tutti i canali"
-
-#: ../../include/oembed.php:171
-msgid "Embedded content"
-msgstr "Contenuti incorporati"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/follow.php:54
 msgid "Response from remote channel was incomplete."
@@ -82,18 +43,9 @@ msgstr "Il canale è stato rimosso e non esiste più."
 msgid "Channel discovery failed."
 msgstr "La ricerca del canale non ha avuto successo."
 
-<<<<<<< HEAD
 #: ../../include/follow.php:149
 msgid "local account not found."
 msgstr "l'account locale non è stato trovato."
-=======
-#: ../../include/Contact.php:107 ../../include/identity.php:675
-#: ../../include/widgets.php:127 ../../include/widgets.php:167
-#: ../../mod/directory.php:183 ../../mod/dirprofile.php:164
-#: ../../mod/suggest.php:51 ../../mod/match.php:62
-msgid "Connect"
-msgstr "Entra in contatto"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/follow.php:158
 msgid "Cannot connect to yourself."
@@ -107,42 +59,19 @@ msgstr "Modifica le proprietà dei file"
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d F Y \\@ G:i"
 
-<<<<<<< HEAD
 #: ../../include/event.php:20 ../../include/bb2diaspora.php:439
 msgid "Starts:"
 msgstr "Inizio:"
-=======
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/ItemObject.php:96 ../../include/menu.php:42
-#: ../../mod/blocks.php:94 ../../mod/connections.php:392
-#: ../../mod/settings.php:577 ../../mod/editblock.php:111
-#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112
-#: ../../mod/editwebpage.php:143 ../../mod/filestorage.php:174
-#: ../../mod/thing.php:235 ../../mod/layouts.php:112 ../../mod/menu.php:59
-#: ../../mod/webpages.php:119
-msgid "Edit"
-msgstr "Modifica"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/event.php:30 ../../include/bb2diaspora.php:447
 msgid "Finishes:"
 msgstr "Fine:"
 
-<<<<<<< HEAD
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
 #: ../../include/identity.php:726 ../../mod/dirprofile.php:105
 #: ../../mod/directory.php:156 ../../mod/events.php:474
 msgid "Location:"
 msgstr "Luogo:"
-=======
-#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:570
-#: ../../include/conversation.php:1088 ../../mod/editblock.php:141
-#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
-#: ../../mod/editwebpage.php:175 ../../mod/webpages.php:123
-#: ../../mod/photos.php:994
-msgid "Preview"
-msgstr "Anteprima"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/widgets.php:29 ../../include/contact_widgets.php:92
 msgid "Categories"
@@ -167,7 +96,6 @@ msgstr "Personali"
 msgid "Connect"
 msgstr "Entra in contatto"
 
-<<<<<<< HEAD
 #: ../../include/widgets.php:129 ../../mod/suggest.php:53
 msgid "Ignore/Hide"
 msgstr "Ignora/nascondi"
@@ -339,11 +267,6 @@ msgstr "Diario pubblico"
 #: ../../include/nav.php:77 ../../include/nav.php:96 ../../boot.php:1450
 msgid "Logout"
 msgstr "Esci"
-=======
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
-msgstr "Può vedere i miei contenuti \"pubblici\""
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/nav.php:77 ../../include/nav.php:96
 msgid "End this session"
@@ -482,51 +405,10 @@ msgstr "Cerca"
 msgid "Search site content"
 msgstr "Cerca nel sito"
 
-<<<<<<< HEAD
 #: ../../include/nav.php:147 ../../include/apps.php:112
 #: ../../mod/directory.php:210
 msgid "Directory"
 msgstr "Tutti i canali"
-=======
-#: ../../include/photos.php:15 ../../include/attach.php:119
-#: ../../include/attach.php:166 ../../include/attach.php:229
-#: ../../include/attach.php:243 ../../include/attach.php:283
-#: ../../include/attach.php:297 ../../include/attach.php:322
-#: ../../include/attach.php:513 ../../include/attach.php:585
-#: ../../include/chat.php:116 ../../include/items.php:3645
-#: ../../mod/mood.php:119 ../../mod/mitem.php:73 ../../mod/achievements.php:27
-#: ../../mod/poke.php:128 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/authtest.php:13 ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/block.php:22 ../../mod/block.php:72
-#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276
-#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:152
-#: ../../mod/profiles.php:453 ../../mod/bookmarks.php:46
-#: ../../mod/channel.php:89 ../../mod/channel.php:193
-#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95
-#: ../../mod/register.php:68 ../../mod/regmod.php:18 ../../mod/common.php:35
-#: ../../mod/network.php:12 ../../mod/connections.php:169
-#: ../../mod/connedit.php:221 ../../mod/delegate.php:6 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/settings.php:492 ../../mod/setup.php:203
-#: ../../mod/editblock.php:34 ../../mod/pdledit.php:21
-#: ../../mod/editlayout.php:48 ../../mod/editpost.php:13
-#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
-#: ../../mod/events.php:140 ../../mod/sources.php:66
-#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59
-#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98
-#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9
-#: ../../mod/thing.php:247 ../../mod/thing.php:263 ../../mod/thing.php:298
-#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:179
-#: ../../mod/item.php:187 ../../mod/item.php:872 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:12
-#: ../../mod/mail.php:108 ../../mod/manage.php:6 ../../mod/menu.php:44
-#: ../../mod/webpages.php:40 ../../mod/message.php:16
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/photos.php:68 ../../mod/photos.php:526
-#: ../../mod/notifications.php:66 ../../index.php:187 ../../index.php:362
-msgid "Permission denied."
-msgstr "Permesso negato."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/nav.php:147
 msgid "Channel Locator"
@@ -540,46 +422,9 @@ msgstr "La tua rete"
 msgid "Your matrix"
 msgstr "La tua rete"
 
-<<<<<<< HEAD
 #: ../../include/nav.php:159
 msgid "Mark all matrix notifications seen"
 msgstr "Segna come lette le notifiche della tua rete"
-=======
-#: ../../include/photos.php:186
-msgid "Photo storage failed."
-msgstr "Impossibile caricare la foto."
-
-#: ../../include/photos.php:311 ../../include/conversation.php:1504
-msgid "Photo Albums"
-msgstr "Album foto"
-
-#: ../../include/photos.php:315 ../../mod/photos.php:693
-#: ../../mod/photos.php:1190
-msgid "Upload New Photos"
-msgstr "Carica nuove foto"
-
-#: ../../include/acl_selectors.php:238
-msgid "Visible to everybody"
-msgstr "Visibile a tutti"
-
-#: ../../include/acl_selectors.php:239
-msgid "Show"
-msgstr "Mostra"
-
-#: ../../include/acl_selectors.php:240
-msgid "Don't show"
-msgstr "Non mostrare"
-
-#: ../../include/acl_selectors.php:246 ../../mod/chat.php:209
-#: ../../mod/filestorage.php:126 ../../mod/photos.php:606
-#: ../../mod/photos.php:949
-msgid "Permissions"
-msgstr "Permessi"
-
-#: ../../include/acl_selectors.php:247
-msgid "Close"
-msgstr "Chiudi"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/nav.php:161 ../../include/apps.php:108
 msgid "Channel Home"
@@ -666,7 +511,6 @@ msgstr "Impostazioni account e canali"
 msgid "Manage/Edit Friends and Connections"
 msgstr "Modifica amici e contatti"
 
-<<<<<<< HEAD
 #: ../../include/nav.php:195 ../../mod/admin.php:117
 msgid "Admin"
 msgstr "Amministrazione"
@@ -674,15 +518,6 @@ msgstr "Amministrazione"
 #: ../../include/nav.php:195
 msgid "Site Setup and Configuration"
 msgstr "Configurazione del sito"
-=======
-#: ../../include/auth.php:198
-msgid "Failed authentication"
-msgstr "Autenticazione fallita"
-
-#: ../../include/auth.php:213 ../../mod/openid.php:188
-msgid "Login failed."
-msgstr "Accesso fallito."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/nav.php:220
 msgid "Nothing new here"
@@ -696,7 +531,6 @@ msgstr "Attendere..."
 msgid "Embedded content"
 msgstr "Contenuti incorporati"
 
-<<<<<<< HEAD
 #: ../../include/oembed.php:180
 msgid "Embedding disabled"
 msgstr "Contenuti incorporati - funzione disabilitata"
@@ -712,25 +546,6 @@ msgid "Image/photo"
 msgstr "Immagine"
 
 #: ../../include/bbcode.php:163 ../../include/bbcode.php:692
-=======
-#: ../../include/bb2diaspora.php:455 ../../include/event.php:40
-#: ../../include/identity.php:726 ../../mod/directory.php:156
-#: ../../mod/dirprofile.php:105 ../../mod/events.php:474
-msgid "Location:"
-msgstr "Luogo:"
-
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:633
-#: ../../include/bbcode.php:636 ../../include/bbcode.php:641
-#: ../../include/bbcode.php:644 ../../include/bbcode.php:647
-#: ../../include/bbcode.php:650 ../../include/bbcode.php:655
-#: ../../include/bbcode.php:658 ../../include/bbcode.php:663
-#: ../../include/bbcode.php:666 ../../include/bbcode.php:669
-#: ../../include/bbcode.php:672
-msgid "Image/photo"
-msgstr "Immagine"
-
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:683
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 msgid "Encrypted content"
 msgstr "Contenuto crittografato"
 
@@ -738,16 +553,11 @@ msgstr "Contenuto crittografato"
 msgid "QR code"
 msgstr "QR code"
 
-<<<<<<< HEAD
 #: ../../include/bbcode.php:228
-=======
-#: ../../include/bbcode.php:219
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s ha scritto %2$s %3$s"
 
-<<<<<<< HEAD
 #: ../../include/bbcode.php:230
 msgid "post"
 msgstr "l'articolo"
@@ -762,233 +572,6 @@ msgid ""
 "<strong>may</strong> apply to this group and any future members. If this is "
 "not what you intended, please create another group with a different name."
 msgstr "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti <strong>potrebbero</strong> rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso."
-=======
-#: ../../include/bbcode.php:221
-msgid "post"
-msgstr "l'articolo"
-
-#: ../../include/bbcode.php:601 ../../include/bbcode.php:621
-msgid "$1 wrote:"
-msgstr "$1 ha scritto:"
-
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:639
-#: ../../mod/photos.php:846
-msgid "Private Message"
-msgstr "Messaggio privato"
-
-#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/admin.php:757 ../../mod/admin.php:886 ../../mod/connedit.php:398
-#: ../../mod/settings.php:578 ../../mod/filestorage.php:175
-#: ../../mod/group.php:176 ../../mod/thing.php:236 ../../mod/photos.php:1043
-msgid "Delete"
-msgstr "Elimina"
-
-#: ../../include/ItemObject.php:114 ../../include/conversation.php:631
-msgid "Select"
-msgstr "Seleziona"
-
-#: ../../include/ItemObject.php:118
-msgid "save to folder"
-msgstr "salva in una cartella"
-
-#: ../../include/ItemObject.php:128
-msgid "Like"
-msgstr "Mi piace"
-
-#: ../../include/ItemObject.php:128 ../../mod/profiles.php:302
-msgid "Likes"
-msgstr "Mi piace"
-
-#: ../../include/ItemObject.php:132
-msgid "Dislike"
-msgstr "Non mi piace"
-
-#: ../../include/ItemObject.php:132 ../../mod/profiles.php:306
-msgid "Dislikes"
-msgstr "Non mi piace"
-
-#: ../../include/ItemObject.php:154
-msgid "add star"
-msgstr "aggiungi ai preferiti"
-
-#: ../../include/ItemObject.php:155
-msgid "remove star"
-msgstr "rimuovi dai preferiti"
-
-#: ../../include/ItemObject.php:156
-msgid "toggle star status"
-msgstr "Attiva/disattiva preferito"
-
-#: ../../include/ItemObject.php:160
-msgid "starred"
-msgstr "preferito"
-
-#: ../../include/ItemObject.php:169 ../../include/conversation.php:646
-msgid "Message is verified"
-msgstr "Messaggio verificato"
-
-#: ../../include/ItemObject.php:177
-msgid "add tag"
-msgstr "Aggiungi tag"
-
-#: ../../include/ItemObject.php:192 ../../mod/photos.php:971
-msgid "I like this (toggle)"
-msgstr "Attiva/disattiva Mi piace"
-
-#: ../../include/ItemObject.php:192 ../../include/taxonomy.php:254
-msgid "like"
-msgstr "mi piace"
-
-#: ../../include/ItemObject.php:193 ../../mod/photos.php:972
-msgid "I don't like this (toggle)"
-msgstr "Attiva/disattiva Non mi piace"
-
-#: ../../include/ItemObject.php:193 ../../include/taxonomy.php:255
-msgid "dislike"
-msgstr "non mi piace"
-
-#: ../../include/ItemObject.php:195
-msgid "Share this"
-msgstr "Condividi"
-
-#: ../../include/ItemObject.php:195
-msgid "share"
-msgstr "condividi"
-
-#: ../../include/ItemObject.php:219 ../../include/ItemObject.php:220
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Guarda il profilo di %s - %s"
-
-#: ../../include/ItemObject.php:221
-msgid "to"
-msgstr "a"
-
-#: ../../include/ItemObject.php:222
-msgid "via"
-msgstr "via"
-
-#: ../../include/ItemObject.php:223
-msgid "Wall-to-Wall"
-msgstr "Da bacheca a bacheca"
-
-#: ../../include/ItemObject.php:224
-msgid "via Wall-To-Wall:"
-msgstr "da bacheca a bacheca:"
-
-#: ../../include/ItemObject.php:234 ../../include/conversation.php:690
-#, php-format
-msgid " from %s"
-msgstr " da %s"
-
-#: ../../include/ItemObject.php:237 ../../include/conversation.php:693
-#, php-format
-msgid "last edited: %s"
-msgstr "ultima modifica: %s"
-
-#: ../../include/ItemObject.php:238 ../../include/conversation.php:694
-#, php-format
-msgid "Expires: %s"
-msgstr "Scadenza: %s"
-
-#: ../../include/ItemObject.php:258
-msgid "Bookmark Links"
-msgstr "I link dei segnalibri"
-
-#: ../../include/ItemObject.php:272 ../../include/conversation.php:711
-#: ../../include/conversation.php:1127 ../../mod/editblock.php:120
-#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121
-#: ../../mod/editwebpage.php:152 ../../mod/mail.php:222 ../../mod/mail.php:336
-#: ../../mod/photos.php:974
-msgid "Please wait"
-msgstr "Attendere"
-
-#: ../../include/ItemObject.php:293
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d commento"
-msgstr[1] "%d commenti"
-
-#: ../../include/ItemObject.php:294 ../../include/contact_widgets.php:130
-#: ../../include/js_strings.php:7
-msgid "show more"
-msgstr "mostra tutto"
-
-#: ../../include/ItemObject.php:558 ../../mod/photos.php:990
-#: ../../mod/photos.php:1077
-msgid "This is you"
-msgstr "Questo sei tu"
-
-#: ../../include/ItemObject.php:560 ../../include/js_strings.php:6
-#: ../../mod/photos.php:992 ../../mod/photos.php:1079
-msgid "Comment"
-msgstr "Commento"
-
-#: ../../include/ItemObject.php:561 ../../mod/mood.php:142
-#: ../../mod/admin.php:441 ../../mod/admin.php:750 ../../mod/admin.php:884
-#: ../../mod/admin.php:1017 ../../mod/admin.php:1216 ../../mod/admin.php:1303
-#: ../../mod/poke.php:166 ../../mod/profiles.php:506 ../../mod/chat.php:177
-#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:476
-#: ../../mod/settings.php:515 ../../mod/settings.php:627
-#: ../../mod/settings.php:655 ../../mod/settings.php:679
-#: ../../mod/settings.php:751 ../../mod/settings.php:929
-#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58
-#: ../../mod/events.php:481 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/filestorage.php:135
-#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/thing.php:283
-#: ../../mod/thing.php:326 ../../mod/import.php:387 ../../mod/invite.php:156
-#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/photos.php:565
-#: ../../mod/photos.php:670 ../../mod/photos.php:953 ../../mod/photos.php:993
-#: ../../mod/photos.php:1080 ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/blogga/php/config.php:67
-#: ../../view/theme/blogga/view/theme/blog/config.php:67
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Salva"
-
-#: ../../include/ItemObject.php:562
-msgid "Bold"
-msgstr "Grassetto"
-
-#: ../../include/ItemObject.php:563
-msgid "Italic"
-msgstr "Corsivo"
-
-#: ../../include/ItemObject.php:564
-msgid "Underline"
-msgstr "Sottolineato"
-
-#: ../../include/ItemObject.php:565
-msgid "Quote"
-msgstr "Citazione"
-
-#: ../../include/ItemObject.php:566
-msgid "Code"
-msgstr "Codice"
-
-#: ../../include/ItemObject.php:567
-msgid "Image"
-msgstr "Immagine"
-
-#: ../../include/ItemObject.php:568
-msgid "Link"
-msgstr "Link"
-
-#: ../../include/ItemObject.php:569
-msgid "Video"
-msgstr "Video"
-
-#: ../../include/ItemObject.php:573 ../../include/conversation.php:1153
-#: ../../mod/editpost.php:148 ../../mod/mail.php:228 ../../mod/mail.php:341
-msgid "Encrypt text"
-msgstr "Crittografia del testo"
-
-#: ../../include/bookmarks.php:42
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "I segnalibri di %1$s"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/group.php:223
 msgid "Default privacy group for new contacts"
@@ -1002,7 +585,6 @@ msgstr "Tutti i canali"
 msgid "edit"
 msgstr "modifica"
 
-<<<<<<< HEAD
 #: ../../include/group.php:285
 msgid "Collections"
 msgstr "Insiemi di canali"
@@ -1010,15 +592,6 @@ msgstr "Insiemi di canali"
 #: ../../include/group.php:286
 msgid "Edit collection"
 msgstr "Modifica l'insieme di canali"
-=======
-#: ../../include/chat.php:105
-msgid "Room not found."
-msgstr "Chat non trovata."
-
-#: ../../include/chat.php:126
-msgid "Room is full"
-msgstr "La chat è al completo"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/group.php:287
 msgid "Create a new collection"
@@ -1193,27 +766,18 @@ msgstr "Poke"
 msgid "%s likes this."
 msgstr "Piace a %s."
 
-<<<<<<< HEAD
 #: ../../include/conversation.php:998
 #, php-format
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."
 
 #: ../../include/conversation.php:1002
-=======
-#: ../../include/text.php:729
-msgid "No connections"
-msgstr "Nessun contatto"
-
-#: ../../include/text.php:742
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] ""
 msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
 
-<<<<<<< HEAD
 #: ../../include/conversation.php:1004
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
@@ -1558,316 +1122,6 @@ msgstr "%1$s ha aggiornato %2$s cambiando %3$s."
 #: ../../include/network.php:652
 msgid "view full size"
 msgstr "guarda nelle dimensioni reali"
-=======
-#: ../../include/text.php:754
-msgid "View Connections"
-msgstr "Elenco contatti"
-
-#: ../../include/text.php:813 ../../include/text.php:827
-#: ../../include/nav.php:144 ../../mod/search.php:29
-msgid "Search"
-msgstr "Cerca"
-
-#: ../../include/text.php:815 ../../include/text.php:829
-#: ../../include/widgets.php:185 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50
-msgid "Save"
-msgstr "Salva"
-
-#: ../../include/text.php:895
-msgid "poke"
-msgstr "poke"
-
-#: ../../include/text.php:895 ../../include/conversation.php:240
-msgid "poked"
-msgstr "ha ricevuto un poke"
-
-#: ../../include/text.php:896
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:896
-msgid "pinged"
-msgstr "ha ricevuto un ping"
-
-#: ../../include/text.php:897
-msgid "prod"
-msgstr "prod"
-
-#: ../../include/text.php:897
-msgid "prodded"
-msgstr "ha ricevuto un prod"
-
-#: ../../include/text.php:898
-msgid "slap"
-msgstr "schiaffo"
-
-#: ../../include/text.php:898
-msgid "slapped"
-msgstr "ha ricevuto uno schiaffo"
-
-#: ../../include/text.php:899
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:899
-msgid "fingered"
-msgstr "ha ricevuto un finger"
-
-#: ../../include/text.php:900
-msgid "rebuff"
-msgstr "rifiuto"
-
-#: ../../include/text.php:900
-msgid "rebuffed"
-msgstr "ha ricevuto un rifiuto"
-
-#: ../../include/text.php:909
-msgid "happy"
-msgstr "allegro"
-
-#: ../../include/text.php:910
-msgid "sad"
-msgstr "triste"
-
-#: ../../include/text.php:911
-msgid "mellow"
-msgstr "calmo"
-
-#: ../../include/text.php:912
-msgid "tired"
-msgstr "stanco"
-
-#: ../../include/text.php:913
-msgid "perky"
-msgstr "vivace"
-
-#: ../../include/text.php:914
-msgid "angry"
-msgstr "arrabbiato"
-
-#: ../../include/text.php:915
-msgid "stupified"
-msgstr "stordito"
-
-#: ../../include/text.php:916
-msgid "puzzled"
-msgstr "confuso"
-
-#: ../../include/text.php:917
-msgid "interested"
-msgstr "attento"
-
-#: ../../include/text.php:918
-msgid "bitter"
-msgstr "amaro"
-
-#: ../../include/text.php:919
-msgid "cheerful"
-msgstr "allegro"
-
-#: ../../include/text.php:920
-msgid "alive"
-msgstr "vivace"
-
-#: ../../include/text.php:921
-msgid "annoyed"
-msgstr "seccato"
-
-#: ../../include/text.php:922
-msgid "anxious"
-msgstr "ansioso"
-
-#: ../../include/text.php:923
-msgid "cranky"
-msgstr "irritabile"
-
-#: ../../include/text.php:924
-msgid "disturbed"
-msgstr "turbato"
-
-#: ../../include/text.php:925
-msgid "frustrated"
-msgstr "frustrato"
-
-#: ../../include/text.php:926
-msgid "depressed"
-msgstr "in depressione"
-
-#: ../../include/text.php:927
-msgid "motivated"
-msgstr "motivato"
-
-#: ../../include/text.php:928
-msgid "relaxed"
-msgstr "rilassato"
-
-#: ../../include/text.php:929
-msgid "surprised"
-msgstr "sorpreso"
-
-#: ../../include/text.php:1090
-msgid "Monday"
-msgstr "lunedì"
-
-#: ../../include/text.php:1090
-msgid "Tuesday"
-msgstr "martedì"
-
-#: ../../include/text.php:1090
-msgid "Wednesday"
-msgstr "mercoledì"
-
-#: ../../include/text.php:1090
-msgid "Thursday"
-msgstr "giovedì"
-
-#: ../../include/text.php:1090
-msgid "Friday"
-msgstr "venerdì"
-
-#: ../../include/text.php:1090
-msgid "Saturday"
-msgstr "sabato"
-
-#: ../../include/text.php:1090
-msgid "Sunday"
-msgstr "domenica"
-
-#: ../../include/text.php:1094
-msgid "January"
-msgstr "gennaio"
-
-#: ../../include/text.php:1094
-msgid "February"
-msgstr "febbraio"
-
-#: ../../include/text.php:1094
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/text.php:1094
-msgid "April"
-msgstr "aprile"
-
-#: ../../include/text.php:1094
-msgid "May"
-msgstr "maggio"
-
-#: ../../include/text.php:1094
-msgid "June"
-msgstr "giugno"
-
-#: ../../include/text.php:1094
-msgid "July"
-msgstr "luglio"
-
-#: ../../include/text.php:1094
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/text.php:1094
-msgid "September"
-msgstr "settembre"
-
-#: ../../include/text.php:1094
-msgid "October"
-msgstr "ottobre"
-
-#: ../../include/text.php:1094
-msgid "November"
-msgstr "novembre"
-
-#: ../../include/text.php:1094
-msgid "December"
-msgstr "dicembre"
-
-#: ../../include/text.php:1172
-msgid "unknown.???"
-msgstr "sconosciuto???"
-
-#: ../../include/text.php:1173
-msgid "bytes"
-msgstr "byte"
-
-#: ../../include/text.php:1208
-msgid "remove category"
-msgstr "rimuovi la categoria"
-
-#: ../../include/text.php:1257
-msgid "remove from file"
-msgstr "rimuovi dal file"
-
-#: ../../include/text.php:1318 ../../include/text.php:1330
-msgid "Click to open/close"
-msgstr "Clicca per aprire/chiudere"
-
-#: ../../include/text.php:1485 ../../mod/events.php:344
-msgid "link to source"
-msgstr "Link all'originale"
-
-#: ../../include/text.php:1504
-msgid "Select a page layout: "
-msgstr "Scegli il layout della pagina:"
-
-#: ../../include/text.php:1507 ../../include/text.php:1572
-msgid "default"
-msgstr "predefinito"
-
-#: ../../include/text.php:1543
-msgid "Page content type: "
-msgstr "Contenuto della pagina:"
-
-#: ../../include/text.php:1584
-msgid "Select an alternate language"
-msgstr "Seleziona una lingua diversa"
-
-#: ../../include/text.php:1705 ../../include/conversation.php:117
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:45 ../../mod/like.php:111
-msgid "photo"
-msgstr "la foto"
-
-#: ../../include/text.php:1708 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr "l'evento"
-
-#: ../../include/text.php:1711 ../../include/conversation.php:145
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:53 ../../mod/like.php:111
-msgid "status"
-msgstr "il messaggio di stato"
-
-#: ../../include/text.php:1713 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr "il commento"
-
-#: ../../include/text.php:1718
-msgid "activity"
-msgstr "l'attività"
-
-#: ../../include/text.php:1977
-msgid "Design"
-msgstr "Design"
-
-#: ../../include/text.php:1979
-msgid "Blocks"
-msgstr "Riquadri"
-
-#: ../../include/text.php:1980
-msgid "Menus"
-msgstr "Menù"
-
-#: ../../include/text.php:1981
-msgid "Layouts"
-msgstr "Layout"
-
-#: ../../include/text.php:1982
-msgid "Pages"
-msgstr "Pagine"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/bookmarks.php:42
 #, php-format
@@ -1894,16 +1148,9 @@ msgstr "ha"
 msgid "want"
 msgstr "voglio"
 
-<<<<<<< HEAD
 #: ../../include/taxonomy.php:253
 msgid "wants"
 msgstr "vuole"
-=======
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:391
-#: ../../mod/directory.php:206 ../../mod/directory.php:211
-msgid "Find"
-msgstr "Cerca"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/taxonomy.php:254 ../../include/ItemObject.php:205
 msgid "like"
@@ -1932,7 +1179,6 @@ msgstr "non mi piace"
 msgid "Edit"
 msgstr "Modifica"
 
-<<<<<<< HEAD
 #: ../../include/ItemObject.php:118
 msgid "save to folder"
 msgstr "salva in una cartella"
@@ -1958,17 +1204,6 @@ msgstr[1] "Non mi piace"
 #: ../../include/ItemObject.php:167
 msgid "add star"
 msgstr "aggiungi ai preferiti"
-=======
-#: ../../include/contact_widgets.php:58 ../../include/features.php:66
-#: ../../include/widgets.php:295
-msgid "Saved Folders"
-msgstr "Cartelle salvate"
-
-#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:95
-#: ../../include/widgets.php:298
-msgid "Everything"
-msgstr "Tutto"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/ItemObject.php:168
 msgid "remove star"
@@ -2345,34 +1580,20 @@ msgstr "%1$s, %2$s ti ha taggato su %3$s"
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
 
-<<<<<<< HEAD
 #: ../../include/enotify.php:225
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
 msgstr "[Red:Notifica] %1$s ti ha mandato un poke"
-=======
-#: ../../include/conversation.php:1415 ../../include/widgets.php:81
-msgid "Personal"
-msgstr "Personali"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/enotify.php:226
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s ti ha mandato un poke su %3$s"
 
-<<<<<<< HEAD
 #: ../../include/enotify.php:227
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
-=======
-#: ../../include/conversation.php:1424 ../../include/widgets.php:83
-#: ../../mod/connections.php:211 ../../mod/connections.php:224
-#: ../../mod/menu.php:61
-msgid "New"
-msgstr "Novità"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/enotify.php:243
 #, php-format
@@ -2418,7 +1639,6 @@ msgstr "Visita %s per approvare o rifiutare la richiesta di entrare in contatto.
 msgid "[Red:Notify] Friend suggestion received"
 msgstr "[Red:Notifica] Ti è stato suggerito un amico"
 
-<<<<<<< HEAD
 #: ../../include/enotify.php:273
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
@@ -2430,12 +1650,6 @@ msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, %4$s ti [zrl=%2$s]ha suggerito %3$s[/zrl] come amico."
-=======
-#: ../../include/conversation.php:1510 ../../include/nav.php:85
-#: ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr "Elenco file"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/enotify.php:280
 msgid "Name:"
@@ -2445,7 +1659,6 @@ msgstr "Nome:"
 msgid "Photo:"
 msgstr "Foto:"
 
-<<<<<<< HEAD
 #: ../../include/enotify.php:284
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
@@ -2454,11 +1667,6 @@ msgstr "Visita %s per approvare o rifiutare il suggerimento."
 #: ../../include/attach.php:224 ../../include/attach.php:278
 msgid "Item was not found."
 msgstr "Elemento non trovato."
-=======
-#: ../../include/conversation.php:1535
-msgid "Events and Calendar"
-msgstr "Calendario eventi"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/attach.php:335
 msgid "No source file."
@@ -2850,16 +2058,9 @@ msgstr "La tua email è già registrata su questo sito."
 msgid "An invitation is required."
 msgstr "È necessario un invito."
 
-<<<<<<< HEAD
 #: ../../include/account.php:68
 msgid "Invitation could not be verified."
 msgstr "L'invito non può essere verificato."
-=======
-#: ../../include/features.php:43 ../../include/widgets.php:502
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Sorgenti del canale"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/account.php:119
 msgid "Please enter the required information."
@@ -2897,15 +2098,9 @@ msgstr "Account approvato."
 msgid "Registration revoked for %s"
 msgstr "Registrazione revocata per %s"
 
-<<<<<<< HEAD
 #: ../../include/Contact.php:123
 msgid "New window"
 msgstr "Nuova finestra"
-=======
-#: ../../include/features.php:52 ../../include/widgets.php:264
-msgid "Saved Searches"
-msgstr "Ricerche salvate"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/Contact.php:124
 msgid "Open the selected location in a different window or browser tab"
@@ -3035,7 +2230,6 @@ msgstr "Accesso fallito."
 msgid "prev"
 msgstr "prec"
 
-<<<<<<< HEAD
 #: ../../include/text.php:322
 msgid "first"
 msgstr "inizio"
@@ -3051,14 +2245,6 @@ msgstr "succ"
 #: ../../include/text.php:366
 msgid "older"
 msgstr "più recenti"
-=======
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti <strong>potrebbero</strong> rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/text.php:368
 msgid "newer"
@@ -3091,7 +2277,6 @@ msgstr "ping"
 msgid "pinged"
 msgstr "ha ricevuto un ping"
 
-<<<<<<< HEAD
 #: ../../include/text.php:897
 msgid "prod"
 msgstr "prod"
@@ -3099,15 +2284,6 @@ msgstr "prod"
 #: ../../include/text.php:897
 msgid "prodded"
 msgstr "ha ricevuto un prod"
-=======
-#: ../../include/group.php:290 ../../include/widgets.php:265
-msgid "add"
-msgstr "aggiungi"
-
-#: ../../include/identity.php:30 ../../mod/item.php:1244
-msgid "Unable to obtain identity information from database"
-msgstr "Impossibile ottenere le informazioni di identificazione dal database"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/text.php:898
 msgid "slap"
@@ -3141,16 +2317,9 @@ msgstr "allegro"
 msgid "sad"
 msgstr "triste"
 
-<<<<<<< HEAD
 #: ../../include/text.php:911
 msgid "mellow"
 msgstr "calmo"
-=======
-#: ../../include/identity.php:342 ../../include/profile_selectors.php:42
-#: ../../include/widgets.php:399 ../../mod/connedit.php:431
-msgid "Friends"
-msgstr "Amici"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/text.php:912
 msgid "tired"
@@ -3244,7 +2413,6 @@ msgstr "giovedì"
 msgid "Friday"
 msgstr "venerdì"
 
-<<<<<<< HEAD
 #: ../../include/text.php:1090
 msgid "Saturday"
 msgstr "sabato"
@@ -3252,11 +2420,6 @@ msgstr "sabato"
 #: ../../include/text.php:1090
 msgid "Sunday"
 msgstr "domenica"
-=======
-#: ../../include/identity.php:950 ../../mod/settings.php:937
-msgid "Full Name:"
-msgstr "Nome completo:"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/text.php:1094
 msgid "January"
@@ -3350,7 +2513,6 @@ msgstr "Seleziona una lingua diversa"
 msgid "activity"
 msgstr "l'attività"
 
-<<<<<<< HEAD
 #: ../../include/text.php:1977
 msgid "Design"
 msgstr "Design"
@@ -3382,46 +2544,6 @@ msgstr "Il nome della chat è duplicato"
 #: ../../include/chat.php:68 ../../include/chat.php:76
 msgid "Invalid room specifier."
 msgstr "Il nome della chat non è valido."
-=======
-#: ../../include/items.php:306 ../../mod/profperm.php:23
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:63
-#: ../../index.php:361
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: ../../include/items.php:830
-msgid "(Unknown)"
-msgstr "(Sconosciuto)"
-
-#: ../../include/items.php:3583 ../../mod/admin.php:159
-#: ../../mod/admin.php:921 ../../mod/admin.php:1124 ../../mod/display.php:32
-#: ../../mod/filestorage.php:18 ../../mod/home.php:63 ../../mod/thing.php:78
-#: ../../mod/viewsrc.php:18
-msgid "Item not found."
-msgstr "Elemento non trovato."
-
-#: ../../include/items.php:4007 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
-msgstr "Insieme non trovato."
-
-#: ../../include/items.php:4022
-msgid "Collection is empty."
-msgstr "L'insieme di canali è vuoto."
-
-#: ../../include/items.php:4029
-#, php-format
-msgid "Collection: %s"
-msgstr "Insieme: %s"
-
-#: ../../include/items.php:4040
-#, php-format
-msgid "Connection: %s"
-msgstr "Contatto: %s"
-
-#: ../../include/items.php:4043
-msgid "Connection not found."
-msgstr "Contatto non trovato."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/chat.php:105
 msgid "Room not found."
@@ -3463,7 +2585,6 @@ msgstr "Attiva la creazione di pagine web sul tuo canale"
 msgid "Private Notes"
 msgstr "Note private"
 
-<<<<<<< HEAD
 #: ../../include/features.php:28
 msgid "Enables a tool to store notes and reminders"
 msgstr "Abilita il riquadro per scrivere annotazioni"
@@ -3536,84 +2657,6 @@ msgstr "Filtraggio dei contenuti"
 #: ../../include/features.php:50
 msgid "Search by Date"
 msgstr "Ricerca per data"
-=======
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr "chiudi tutto"
-
-#: ../../include/js_strings.php:19
-msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
-
-#: ../../include/js_strings.php:20
-msgid "timeago.prefixFromNow"
-msgstr "timeago.prefixFromNow"
-
-#: ../../include/js_strings.php:21
-msgid "ago"
-msgstr "fa"
-
-#: ../../include/js_strings.php:22
-msgid "from now"
-msgstr "da adesso"
-
-#: ../../include/js_strings.php:23
-msgid "less than a minute"
-msgstr "meno di un minuto"
-
-#: ../../include/js_strings.php:24
-msgid "about a minute"
-msgstr "circa un minuto"
-
-#: ../../include/js_strings.php:25
-#, php-format
-msgid "%d minutes"
-msgstr "%d minuti"
-
-#: ../../include/js_strings.php:26
-msgid "about an hour"
-msgstr "circa un’ora"
-
-#: ../../include/js_strings.php:27
-#, php-format
-msgid "about %d hours"
-msgstr "circa %d ore"
-
-#: ../../include/js_strings.php:28
-msgid "a day"
-msgstr "un giorno"
-
-#: ../../include/js_strings.php:29
-#, php-format
-msgid "%d days"
-msgstr "%d giorni"
-
-#: ../../include/js_strings.php:30
-msgid "about a month"
-msgstr "circa un mese"
-
-#: ../../include/js_strings.php:31
-#, php-format
-msgid "%d months"
-msgstr "%d mesi"
-
-#: ../../include/js_strings.php:32
-msgid "about a year"
-msgstr "circa un anno"
-
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "%d years"
-msgstr "%d anni"
-
-#: ../../include/js_strings.php:34
-msgid " "
-msgstr " "
-
-#: ../../include/js_strings.php:35
-msgid "timeago.numbers"
-msgstr "timeago.numbers"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/features.php:50
 msgid "Ability to select posts by date ranges"
@@ -3723,15 +2766,9 @@ msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"
 msgid "Can view my \"public\" stream and posts"
 msgstr "Può vedere i miei contenuti \"pubblici\""
 
-<<<<<<< HEAD
 #: ../../include/permissions.php:14
 msgid "Can view my \"public\" channel profile"
 msgstr "Può vedere il profilo del mio canale \"pubblico\""
-=======
-#: ../../include/nav.php:142 ../../mod/apps.php:17
-msgid "Apps"
-msgstr "Apps"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/permissions.php:15
 msgid "Can view my \"public\" photo albums"
@@ -3741,7 +2778,6 @@ msgstr "Può vedere il mio album fotografico \"pubblico\""
 msgid "Can view my \"public\" address book"
 msgstr "Può vedere il mio elenco contatti \"pubblico\""
 
-<<<<<<< HEAD
 #: ../../include/permissions.php:17
 msgid "Can view my \"public\" file storage"
 msgstr "Può vedere il mio archivio file \"pubblico\""
@@ -3757,21 +2793,11 @@ msgstr "È tra i canali che seguo"
 #: ../../include/permissions.php:22
 msgid "Can post on my channel page (\"wall\")"
 msgstr "Può scrivere sulla bacheca del mio canale"
-=======
-#: ../../include/nav.php:147
-msgid "Channel Locator"
-msgstr "Ricerca canali"
-
-#: ../../include/nav.php:158
-msgid "Your matrix"
-msgstr "La tua rete"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/permissions.php:23
 msgid "Can comment on my posts"
 msgstr "Può commentare i miei articoli"
 
-<<<<<<< HEAD
 #: ../../include/permissions.php:24
 msgid "Can send me private mail messages"
 msgstr "Può inviarmi messaggi privati"
@@ -3779,26 +2805,14 @@ msgstr "Può inviarmi messaggi privati"
 #: ../../include/permissions.php:25
 msgid "Can post photos to my photo albums"
 msgstr "Può aggiungere foto ai miei album"
-=======
-#: ../../include/nav.php:161
-msgid "Channel home"
-msgstr "Bacheca del canale"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/permissions.php:26
 msgid "Can forward to all my channel contacts via post @mentions"
 msgstr "Può inoltrare articoli a tutti i contatti del canale tramite una @menzione"
 
-<<<<<<< HEAD
 #: ../../include/permissions.php:26
 msgid "Advanced - useful for creating group forum channels"
 msgstr "Impostazione avanzata - utile per creare un canale-forum di discussione"
-=======
-#: ../../include/nav.php:165 ../../include/nav.php:188
-#: ../../mod/connections.php:385
-msgid "Connections"
-msgstr "Contatti"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/permissions.php:27
 msgid "Can chat with me (when available)"
@@ -3812,15 +2826,9 @@ msgstr "Può scrivere sul mio archivio di file \"pubblico\""
 msgid "Can edit my \"public\" pages"
 msgstr "Può modificare le mie pagine web \"pubbliche\""
 
-<<<<<<< HEAD
 #: ../../include/permissions.php:31
 msgid "Can source my \"public\" posts in derived channels"
 msgstr "Può aggiungere i miei post \"pubblici\" a un suo canale derivato"
-=======
-#: ../../include/nav.php:170 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
-msgstr "Segna come lette le notifiche di sistema"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/permissions.php:31
 msgid "Somewhat advanced - very useful in open communities"
@@ -3848,18 +2856,12 @@ msgstr "Impossibile verificare la firma elettronica del canale"
 msgid "Unable to verify site signature for %s"
 msgstr "Impossibile verificare la firma elettronica del sito %s"
 
-<<<<<<< HEAD
 #: ../../include/contact_widgets.php:14
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d invito disponibile"
 msgstr[1] "%d inviti disponibili"
-=======
-#: ../../include/nav.php:177 ../../include/widgets.php:535
-msgid "New Message"
-msgstr "Nuovo messaggio"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/contact_widgets.php:19 ../../mod/admin.php:445
 msgid "Advanced"
@@ -3881,17 +2883,10 @@ msgstr "Entra in contatto"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Per esempio: Mario Rossi, Pesca"
 
-<<<<<<< HEAD
 #: ../../include/contact_widgets.php:26 ../../mod/directory.php:206
 #: ../../mod/directory.php:211 ../../mod/connections.php:391
 msgid "Find"
 msgstr "Cerca"
-=======
-#: ../../include/nav.php:186 ../../include/widgets.php:513
-#: ../../mod/admin.php:976 ../../mod/admin.php:1181
-msgid "Settings"
-msgstr "Impostazioni"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59
 msgid "Channel Suggestions"
@@ -3924,7 +2919,6 @@ msgstr[1] "%d contatti in comune"
 msgid "Miscellaneous"
 msgstr "Altro"
 
-<<<<<<< HEAD
 #: ../../include/datetime.php:152 ../../include/datetime.php:284
 msgid "year"
 msgstr "anno"
@@ -3936,19 +2930,6 @@ msgstr "mese"
 #: ../../include/datetime.php:162 ../../include/datetime.php:287
 msgid "day"
 msgstr "giorno"
-=======
-#: ../../include/plugin.php:486 ../../include/plugin.php:488
-msgid "Click here to upgrade."
-msgstr "Clicca qui per aggiornare."
-
-#: ../../include/plugin.php:494
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Questa operazione esce dai termini del tuo abbonamento."
-
-#: ../../include/plugin.php:499
-msgid "This action is not available under your subscription plan."
-msgstr "Questa operazione non è prevista dal tuo abbonamento."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/datetime.php:275
 msgid "never"
@@ -4189,7 +3170,6 @@ msgstr "Religione:"
 msgid "About:"
 msgstr "Informazioni:"
 
-<<<<<<< HEAD
 #: ../../include/identity.php:1000
 msgid "Hobbies/Interests:"
 msgstr "Interessi e hobby:"
@@ -4319,163 +3299,6 @@ msgstr "circa un’ora"
 #, php-format
 msgid "about %d hours"
 msgstr "circa %d ore"
-=======
-#: ../../include/reddav.php:1045
-msgid "Edit File properties"
-msgstr "Modifica le proprietà dei file"
-
-#: ../../include/zot.php:587
-msgid "Invalid data packet"
-msgstr "Dati non validi"
-
-#: ../../include/zot.php:597
-msgid "Unable to verify channel signature"
-msgstr "Impossibile verificare la firma elettronica del canale"
-
-#: ../../include/zot.php:794
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Impossibile verificare la firma elettronica del sito %s"
-
-#: ../../include/security.php:301
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corretto. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto."
-
-#: ../../include/widgets.php:79
-msgid "App Category"
-msgstr "Categorie App"
-
-#: ../../include/widgets.php:80
-msgid "System"
-msgstr "Sistema"
-
-#: ../../include/widgets.php:82
-msgid "Featured"
-msgstr "In evidenza"
-
-#: ../../include/widgets.php:129 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
-msgstr "Ignora/nascondi"
-
-#: ../../include/widgets.php:135 ../../mod/connections.php:266
-msgid "Suggestions"
-msgstr "Suggerimenti"
-
-#: ../../include/widgets.php:136
-msgid "See more..."
-msgstr "Altro..."
-
-#: ../../include/widgets.php:158
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
-
-#: ../../include/widgets.php:164
-msgid "Add New Connection"
-msgstr "Aggiungi un contatto"
-
-#: ../../include/widgets.php:165
-msgid "Enter the channel address"
-msgstr "Scrivi l'indirizzo del canale"
-
-#: ../../include/widgets.php:166
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
-
-#: ../../include/widgets.php:183
-msgid "Notes"
-msgstr "Note"
-
-#: ../../include/widgets.php:255
-msgid "Remove term"
-msgstr "Rimuovi termine"
-
-#: ../../include/widgets.php:334
-msgid "Archives"
-msgstr "Archivi"
-
-#: ../../include/widgets.php:396
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: ../../include/widgets.php:397 ../../mod/connedit.php:428
-msgid "Me"
-msgstr "Io"
-
-#: ../../include/widgets.php:398 ../../mod/connedit.php:430
-msgid "Best Friends"
-msgstr "Buoni amici"
-
-#: ../../include/widgets.php:400
-msgid "Co-workers"
-msgstr "Colleghi"
-
-#: ../../include/widgets.php:401 ../../mod/connedit.php:432
-msgid "Former Friends"
-msgstr "Ex amici"
-
-#: ../../include/widgets.php:402 ../../mod/connedit.php:433
-msgid "Acquaintances"
-msgstr "Conoscenti"
-
-#: ../../include/widgets.php:403
-msgid "Everybody"
-msgstr "Tutti"
-
-#: ../../include/widgets.php:435
-msgid "Account settings"
-msgstr "Impostazioni dell'account"
-
-#: ../../include/widgets.php:441
-msgid "Channel settings"
-msgstr "Impostazioni del canale"
-
-#: ../../include/widgets.php:447
-msgid "Additional features"
-msgstr "Funzionalità aggiuntive"
-
-#: ../../include/widgets.php:453
-msgid "Feature settings"
-msgstr "Impostazioni aggiuntive"
-
-#: ../../include/widgets.php:459
-msgid "Display settings"
-msgstr "Impostazioni grafiche"
-
-#: ../../include/widgets.php:465
-msgid "Connected apps"
-msgstr "App connesse"
-
-#: ../../include/widgets.php:471
-msgid "Export channel"
-msgstr "Esporta il canale"
-
-#: ../../include/widgets.php:483
-msgid "Automatic Permissions (Advanced)"
-msgstr "Permessi predefiniti (avanzato)"
-
-#: ../../include/widgets.php:493
-msgid "Premium Channel Settings"
-msgstr "Canale premium - impostazioni"
-
-#: ../../include/widgets.php:530
-msgid "Check Mail"
-msgstr "Controlla i messaggi"
-
-#: ../../include/widgets.php:611
-msgid "Chat Rooms"
-msgstr "Chat attive"
-
-#: ../../include/widgets.php:629
-msgid "Bookmarked Chatrooms"
-msgstr "Chat nei segnalibri"
-
-#: ../../include/widgets.php:647
-msgid "Suggested Chatrooms"
-msgstr "Chat suggerite"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../include/js_strings.php:28
 msgid "a day"
@@ -5279,7 +4102,6 @@ msgstr "Sorgente non trovata."
 msgid "Edit Source"
 msgstr "Modifica la sorgente"
 
-<<<<<<< HEAD
 #: ../../mod/sources.php:131
 msgid "Delete Source"
 msgstr "Elimina la sorgente"
@@ -5291,11 +4113,6 @@ msgstr "Sorgente eliminata"
 #: ../../mod/sources.php:160
 msgid "Unable to remove source."
 msgstr "Impossibile rimuovere la sorgente."
-=======
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Elemento non disponibile."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/profperm.php:29 ../../mod/profperm.php:58
 msgid "Invalid profile identifier."
@@ -5309,7 +4126,6 @@ msgstr "Modifica la visibilità del profilo"
 msgid "Click on a contact to add or remove."
 msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
 
-<<<<<<< HEAD
 #: ../../mod/profperm.php:123
 msgid "Visible To"
 msgstr "Visibile a"
@@ -5317,12 +4133,6 @@ msgstr "Visibile a"
 #: ../../mod/profperm.php:139 ../../mod/connections.php:278
 msgid "All Connections"
 msgstr "Tutti i contatti"
-=======
-#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:100
-#: ../../mod/help.php:72 ../../index.php:237
-msgid "Page not found."
-msgstr "Pagina non trovata."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/profile_photo.php:108
 msgid "Image uploaded but image cropping failed."
@@ -5408,54 +4218,11 @@ msgstr "Il ridimensionamento del'immagine [%s] è fallito."
 msgid "Block Name"
 msgstr "Nome del riquadro"
 
-<<<<<<< HEAD
 #: ../../mod/post.php:226
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."
-=======
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
-msgid "Profile not found."
-msgstr "Profilo non trovato."
-
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profilo eliminato."
-
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Profilo-"
-
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Il nuovo profilo è stato creato."
-
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Impossibile duplicare il profilo."
-
-#: ../../mod/profiles.php:178
-msgid "Profile Name is required."
-msgstr "Il nome del profilo è obbligatorio ."
-
-#: ../../mod/profiles.php:294
-msgid "Marital Status"
-msgstr "Stato sentimentale"
-
-#: ../../mod/profiles.php:298
-msgid "Romantic Partner"
-msgstr "Partner affettivo"
-
-#: ../../mod/profiles.php:310
-msgid "Work/Employment"
-msgstr "Lavoro/impiego"
-
-#: ../../mod/profiles.php:313
-msgid "Religion"
-msgstr "Religione"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/post.php:257 ../../mod/openid.php:72 ../../mod/openid.php:178
 #, php-format
@@ -5653,15 +4420,9 @@ msgstr "Per bloccare o meno questo contatto"
 msgid "Unignore"
 msgstr "Non ignorare"
 
-<<<<<<< HEAD
 #: ../../mod/connedit.php:382
 msgid "Ignore or Unignore this connection"
 msgstr "Per ignorare o meno questo contatto"
-=======
-#: ../../mod/profperm.php:139 ../../mod/connections.php:278
-msgid "All Connections"
-msgstr "Tutti i contatti"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/connedit.php:385
 msgid "Unarchive"
@@ -5719,7 +4480,6 @@ msgstr "Hai ricevuto da un canale una richiesta di entrare in contatto, se prose
 msgid "Slide to adjust your degree of friendship"
 msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-<<<<<<< HEAD
 #: ../../mod/connedit.php:472
 msgid "inherited"
 msgstr "derivato"
@@ -5756,44 +4516,6 @@ msgstr "Modifica le informazioni sul contatto"
 #: ../../mod/connedit.php:482
 msgid "Their Settings"
 msgstr "Permessi concessi a te"
-=======
-#: ../../mod/chat.php:167
-msgid "Room not found"
-msgstr "Chat non trovata"
-
-#: ../../mod/chat.php:178
-msgid "Leave Room"
-msgstr "Lascia la chat"
-
-#: ../../mod/chat.php:179
-msgid "Delete This Room"
-msgstr "Elimina questa chat"
-
-#: ../../mod/chat.php:180
-msgid "I am away right now"
-msgstr "Non sono presente al momento"
-
-#: ../../mod/chat.php:181
-msgid "I am online"
-msgstr "Sono online"
-
-#: ../../mod/chat.php:183
-msgid "Bookmark this room"
-msgstr "Aggiungi chat ai segnalibri"
-
-#: ../../mod/chat.php:207 ../../mod/chat.php:229
-msgid "New Chatroom"
-msgstr "Nuova chat"
-
-#: ../../mod/chat.php:208
-msgid "Chatroom Name"
-msgstr "Nome della chat"
-
-#: ../../mod/chat.php:225
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Le chat di %1$s"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/connedit.php:483
 msgid "My Settings"
@@ -5987,7 +4709,6 @@ msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio,
 msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
-<<<<<<< HEAD
 #: ../../mod/settings.php:514 ../../mod/settings.php:540
 #: ../../mod/settings.php:576
 msgid "Add application"
@@ -6075,92 +4796,6 @@ msgstr "Nuova password:"
 #: ../../mod/settings.php:626
 msgid "Confirm:"
 msgstr "Conferma:"
-=======
-#: ../../mod/connections.php:191 ../../mod/connections.php:291
-msgid "Blocked"
-msgstr "Bloccati"
-
-#: ../../mod/connections.php:196 ../../mod/connections.php:298
-msgid "Ignored"
-msgstr "Ignorati"
-
-#: ../../mod/connections.php:201 ../../mod/connections.php:312
-msgid "Hidden"
-msgstr "Nascosti"
-
-#: ../../mod/connections.php:206 ../../mod/connections.php:305
-msgid "Archived"
-msgstr "Archiviati"
-
-#: ../../mod/connections.php:230 ../../mod/connections.php:244
-msgid "All"
-msgstr "Tutti"
-
-#: ../../mod/connections.php:239 ../../mod/connections.php:319
-msgid "Unconnected"
-msgstr "Non connesso"
-
-#: ../../mod/connections.php:269
-msgid "Suggest new connections"
-msgstr "Suggerisci nuovi contatti"
-
-#: ../../mod/connections.php:272
-msgid "New Connections"
-msgstr "Nuovi contatti"
-
-#: ../../mod/connections.php:275
-msgid "Show pending (new) connections"
-msgstr "Richieste di contatto in attesa"
-
-#: ../../mod/connections.php:281
-msgid "Show all connections"
-msgstr "Mostra tutti i contatti"
-
-#: ../../mod/connections.php:284
-msgid "Unblocked"
-msgstr "Non bloccati"
-
-#: ../../mod/connections.php:287
-msgid "Only show unblocked connections"
-msgstr "Mostra solo i contatti non bloccati"
-
-#: ../../mod/connections.php:294
-msgid "Only show blocked connections"
-msgstr "Mostra solo i contatti bloccati"
-
-#: ../../mod/connections.php:301
-msgid "Only show ignored connections"
-msgstr "Mostra solo i contatti ignorati"
-
-#: ../../mod/connections.php:308
-msgid "Only show archived connections"
-msgstr "Mostra solo i contatti archiviati"
-
-#: ../../mod/connections.php:315
-msgid "Only show hidden connections"
-msgstr "Mostra solo i contatti nascosti"
-
-#: ../../mod/connections.php:322
-msgid "Only show one-way connections"
-msgstr "Mostra solo i contatti non ricambiati"
-
-#: ../../mod/connections.php:367
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr "%1$s [%2$s]"
-
-#: ../../mod/connections.php:368
-msgid "Edit contact"
-msgstr "Modifica il contatto"
-
-#: ../../mod/connections.php:389
-msgid "Search your connections"
-msgstr "Cerca tra i contatti"
-
-#: ../../mod/connections.php:390
-msgid "Finding: "
-msgstr "Ricerca: "
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/settings.php:626
 msgid "Leave password fields blank unless changing"
@@ -7083,31 +5718,19 @@ msgstr "Utente del sito (%s)"
 msgid "Password reset requested at %s"
 msgstr "È stato richiesto di reimpostare password su %s"
 
-<<<<<<< HEAD
 #: ../../mod/lostpass.php:63
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non può essere reimpostata."
-=======
-#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Leggi il file 'install/INSTALL.txt'."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/lostpass.php:85 ../../boot.php:1461
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
-<<<<<<< HEAD
 #: ../../mod/lostpass.php:86
 msgid "Your password has been reset as requested."
 msgstr "La password è stata reimpostata come richiesto."
-=======
-#: ../../mod/setup.php:261 ../../mod/events.php:369
-msgid "Next"
-msgstr "Successivo"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/lostpass.php:87
 msgid "Your new password is"
@@ -7363,7 +5986,6 @@ msgstr "Oppure fornisci i dettagli del vecchio server/hub"
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"
 
-<<<<<<< HEAD
 #: ../../mod/import.php:381
 msgid "Your old login email address"
 msgstr "L'email che usavi per accedere sul vecchio server"
@@ -7419,79 +6041,6 @@ msgstr "Aggiungi chat ai segnalibri"
 #: ../../mod/chat.php:207 ../../mod/chat.php:229
 msgid "New Chatroom"
 msgstr "Nuova chat"
-=======
-#: ../../mod/setup.php:569
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito."
-
-#: ../../mod/setup.php:570
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "Se abiliti https per il tuo sito o permetti connessioni TCP su port 443 (quella di https), DEVI usare un certificato riconosciuto dai browser internet. NON DEVI usare certificati generati da te!"
-
-#: ../../mod/setup.php:571
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server."
-
-#: ../../mod/setup.php:572
-msgid ""
-"If your certificate is not recognised, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "Se il tuo certificato non è riconosciuto, gli utenti che ti seguono da altri siti (che avranno certificati validi) riceveranno un avviso su possibili problemi di sicurezza."
-
-#: ../../mod/setup.php:573
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Ciò può creare gravi problemi di usabilità (non solo sul tuo sito), quindi dobbiamo insistere su questo punto."
-
-#: ../../mod/setup.php:574
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Eventualmente, considera che esistono provider che rilasciano certificati gratuiti riconosciuti dai browser."
-
-#: ../../mod/setup.php:576
-msgid "SSL certificate validation"
-msgstr "Validazione del certificato SSL"
-
-#: ../../mod/setup.php:582
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "In .htaccess la funzionalità url rewrite non funziona. Controlla la configurazione del server."
-
-#: ../../mod/setup.php:584
-msgid "Url rewrite is working"
-msgstr "Url rewrite funziona correttamente"
-
-#: ../../mod/setup.php:594
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare questo file di configurazione nella cartella principale del tuo sito."
-
-#: ../../mod/setup.php:618
-msgid "Errors encountered creating database tables."
-msgstr "La creazione delle tabelle del database ha generato errori."
-
-#: ../../mod/setup.php:653
-msgid "<h1>What next</h1>"
-msgstr "<h1>I prossimi passi</h1>"
-
-#: ../../mod/setup.php:654
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/chat.php:208
 msgid "Chatroom Name"
@@ -7611,7 +6160,6 @@ msgstr "Sesso"
 msgid "Sexual Preference"
 msgstr "Preferenze sessuali"
 
-<<<<<<< HEAD
 #: ../../mod/profiles.php:329
 msgid "Homepage"
 msgstr "Home page"
@@ -7671,68 +6219,6 @@ msgstr "Titolo/descrizione:"
 #: ../../mod/profiles.php:515
 msgid "Your Gender:"
 msgstr "Sesso:"
-=======
-#: ../../mod/events.php:299
-msgid "l, F j"
-msgstr "l j F"
-
-#: ../../mod/events.php:321
-msgid "Edit event"
-msgstr "Modifica l'evento"
-
-#: ../../mod/events.php:367
-msgid "Create New Event"
-msgstr "Crea un nuovo evento"
-
-#: ../../mod/events.php:368
-msgid "Previous"
-msgstr "Precendente"
-
-#: ../../mod/events.php:439
-msgid "hour:minute"
-msgstr "ora:minuti"
-
-#: ../../mod/events.php:459
-msgid "Event details"
-msgstr "Dettagli evento"
-
-#: ../../mod/events.php:460
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
-msgstr "Il formato è %s %s. L'inizio e il titolo sono obbligatori."
-
-#: ../../mod/events.php:462
-msgid "Event Starts:"
-msgstr "Inizio:"
-
-#: ../../mod/events.php:462 ../../mod/events.php:476
-msgid "Required"
-msgstr "Obbligatorio"
-
-#: ../../mod/events.php:465
-msgid "Finish date/time is not known or not relevant"
-msgstr "La data/ora di fine non è rilevante"
-
-#: ../../mod/events.php:467
-msgid "Event Finishes:"
-msgstr "Fine:"
-
-#: ../../mod/events.php:470
-msgid "Adjust for viewer timezone"
-msgstr "Adatta al fuso orario di chi legge"
-
-#: ../../mod/events.php:472
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: ../../mod/events.php:476
-msgid "Title:"
-msgstr "Titolo:"
-
-#: ../../mod/events.php:478
-msgid "Share this event"
-msgstr "Condividi questo evento"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/profiles.php:516
 #, php-format
@@ -7933,15 +6419,9 @@ msgstr "Menù eliminato."
 msgid "Menu could not be deleted."
 msgstr "Il menù non può essere eliminato."
 
-<<<<<<< HEAD
 #: ../../mod/menu.php:106
 msgid "Edit Menu"
 msgstr "Modifica menù"
-=======
-#: ../../mod/help.php:69 ../../index.php:234
-msgid "Not Found"
-msgstr "Non disponibile"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/menu.php:108
 msgid "Add or remove entries to this menu"
@@ -8165,7 +6645,6 @@ msgstr "Amministrazione"
 msgid "Summary"
 msgstr "Riepilogo"
 
-<<<<<<< HEAD
 #: ../../mod/admin.php:205
 msgid "Registered users"
 msgstr "Utenti registrati"
@@ -8185,29 +6664,6 @@ msgstr "Plugin attivi"
 #: ../../mod/admin.php:360
 msgid "Site settings updated."
 msgstr "Impostazioni del sito aggiornate."
-=======
-#: ../../mod/item.php:352
-msgid "Empty post discarded."
-msgstr "L'articolo vuoto è stato ignorato."
-
-#: ../../mod/item.php:392
-msgid "Executable content type not permitted to this channel."
-msgstr "I contenuti eseguibili non sono permessi su questo canale."
-
-#: ../../mod/item.php:806
-msgid "System error. Post not saved."
-msgstr "Errore di sistema. Articolo non salvato."
-
-#: ../../mod/item.php:1249
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale."
-
-#: ../../mod/item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/admin.php:391
 msgid "No special theme for accessibility"
@@ -8229,7 +6685,6 @@ msgstr "È un servizio a pagamento"
 msgid "My site has free access only"
 msgstr "È un servizio gratuito"
 
-<<<<<<< HEAD
 #: ../../mod/admin.php:429
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "È un servizio gratuito con opzioni aggiuntive a pagamento"
@@ -8241,20 +6696,6 @@ msgstr "Registrazione"
 #: ../../mod/admin.php:443
 msgid "File upload"
 msgstr "Caricamento file"
-=======
-#: ../../mod/viewconnections.php:58
-msgid "No connections."
-msgstr "Nessun contatto."
-
-#: ../../mod/viewconnections.php:70
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Visita il profilo di %s [%s]"
-
-#: ../../mod/viewconnections.php:85
-msgid "View Connnections"
-msgstr "Guarda i contatti"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/admin.php:444
 msgid "Policies"
@@ -8800,7 +7241,6 @@ msgstr "Per registrarsi su questo sito è necessario un invito."
 msgid "Please enter your invitation code"
 msgstr "Inserisci il codice dell'invito"
 
-<<<<<<< HEAD
 #: ../../mod/register.php:198
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
@@ -8808,15 +7248,6 @@ msgstr "Il tuo indirizzo email"
 #: ../../mod/register.php:199
 msgid "Choose a password"
 msgstr "Scegli una password"
-=======
-#: ../../mod/notifications.php:94 ../../mod/notify.php:54
-msgid "No more system notifications."
-msgstr "Non ci sono nuove notifiche di sistema."
-
-#: ../../mod/notifications.php:98 ../../mod/notify.php:58
-msgid "System Notifications"
-msgstr "Notifiche di sistema"
->>>>>>> 2d91268b5de40d2c2af4bac154593705e8c62bcb
 
 #: ../../mod/register.php:200
 msgid "Please re-enter your password"