From 2d91268b5de40d2c2af4bac154593705e8c62bcb Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sat, 17 May 2014 11:25:39 +0200 Subject: IT: strings updated --- view/it/messages.po | 1068 ++++++++++++++++++++++++++------------------------- view/it/strings.php | 129 ++++--- 2 files changed, 613 insertions(+), 584 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 5a1e6f775..d1821ee2d 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-02 00:03-0700\n" -"PO-Revision-Date: 2014-05-09 08:00+0000\n" +"POT-Creation-Date: 2014-05-16 00:02-0700\n" +"PO-Revision-Date: 2014-05-17 09:17+0000\n" "Last-Translator: tuscanhobbit Pa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" @@ -35,6 +35,34 @@ msgstr "Non trovo le informazioni DNS per il database server '%s'" msgid "Profile Photos" msgstr "Foto del profilo" +#: ../../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" @@ -53,7 +81,7 @@ msgid "commented on %s's post" msgstr "ha commentato l'articolo di %s" #: ../../include/Contact.php:107 ../../include/identity.php:675 -#: ../../include/widgets.php:115 ../../include/widgets.php:155 +#: ../../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" @@ -73,7 +101,7 @@ msgstr "Nuova pagina web" #: ../../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:391 +#: ../../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 @@ -87,7 +115,7 @@ msgstr "Modifica" msgid "View" msgstr "Guarda" -#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:557 +#: ../../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 @@ -115,203 +143,6 @@ msgstr "Creato" msgid "Edited" msgstr "Modificato" -#: ../../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:146 -msgid "add star" -msgstr "aggiungi ai preferiti" - -#: ../../include/ItemObject.php:147 -msgid "remove star" -msgstr "rimuovi dai preferiti" - -#: ../../include/ItemObject.php:148 -msgid "toggle star status" -msgstr "Attiva/disattiva preferito" - -#: ../../include/ItemObject.php:152 -msgid "starred" -msgstr "preferito" - -#: ../../include/ItemObject.php:161 ../../include/conversation.php:646 -msgid "Message is verified" -msgstr "Messaggio verificato" - -#: ../../include/ItemObject.php:169 -msgid "add tag" -msgstr "Aggiungi tag" - -#: ../../include/ItemObject.php:184 ../../mod/photos.php:971 -msgid "I like this (toggle)" -msgstr "Attiva/disattiva Mi piace" - -#: ../../include/ItemObject.php:184 ../../include/taxonomy.php:254 -msgid "like" -msgstr "mi piace" - -#: ../../include/ItemObject.php:185 ../../mod/photos.php:972 -msgid "I don't like this (toggle)" -msgstr "Attiva/disattiva Non mi piace" - -#: ../../include/ItemObject.php:185 ../../include/taxonomy.php:255 -msgid "dislike" -msgstr "non mi piace" - -#: ../../include/ItemObject.php:187 -msgid "Share this" -msgstr "Condividi" - -#: ../../include/ItemObject.php:187 -msgid "share" -msgstr "condividi" - -#: ../../include/ItemObject.php:211 ../../include/ItemObject.php:212 -#, php-format -msgid "View %s's profile - %s" -msgstr "Guarda il profilo di %s - %s" - -#: ../../include/ItemObject.php:213 -msgid "to" -msgstr "a" - -#: ../../include/ItemObject.php:214 -msgid "via" -msgstr "via" - -#: ../../include/ItemObject.php:215 -msgid "Wall-to-Wall" -msgstr "Da bacheca a bacheca" - -#: ../../include/ItemObject.php:216 -msgid "via Wall-To-Wall:" -msgstr "da bacheca a bacheca:" - -#: ../../include/ItemObject.php:226 ../../include/conversation.php:690 -#, php-format -msgid " from %s" -msgstr " da %s" - -#: ../../include/ItemObject.php:229 ../../include/conversation.php:693 -#, php-format -msgid "last edited: %s" -msgstr "ultima modifica: %s" - -#: ../../include/ItemObject.php:230 ../../include/conversation.php:694 -#, php-format -msgid "Expires: %s" -msgstr "Scadenza: %s" - -#: ../../include/ItemObject.php:250 -msgid "Bookmark Links" -msgstr "I link dei segnalibri" - -#: ../../include/ItemObject.php:259 ../../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:280 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d commento" -msgstr[1] "%d commenti" - -#: ../../include/ItemObject.php:281 ../../include/contact_widgets.php:130 -#: ../../include/js_strings.php:7 -msgid "show more" -msgstr "mostra tutto" - -#: ../../include/ItemObject.php:545 ../../mod/photos.php:990 -#: ../../mod/photos.php:1077 -msgid "This is you" -msgstr "Questo sei tu" - -#: ../../include/ItemObject.php:547 ../../include/js_strings.php:6 -#: ../../mod/photos.php:992 ../../mod/photos.php:1079 -msgid "Comment" -msgstr "Commento" - -#: ../../include/ItemObject.php:548 ../../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:175 -#: ../../mod/chat.php:208 ../../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:472 ../../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:549 -msgid "Bold" -msgstr "Grassetto" - -#: ../../include/ItemObject.php:550 -msgid "Italic" -msgstr "Corsivo" - -#: ../../include/ItemObject.php:551 -msgid "Underline" -msgstr "Sottolineato" - -#: ../../include/ItemObject.php:552 -msgid "Quote" -msgstr "Citazione" - -#: ../../include/ItemObject.php:553 -msgid "Code" -msgstr "Codice" - -#: ../../include/ItemObject.php:554 -msgid "Image" -msgstr "Immagine" - -#: ../../include/ItemObject.php:555 -msgid "Link" -msgstr "Link" - -#: ../../include/ItemObject.php:556 -msgid "Video" -msgstr "Video" - -#: ../../include/ItemObject.php:560 ../../include/conversation.php:1153 -#: ../../mod/editpost.php:148 ../../mod/mail.php:228 ../../mod/mail.php:341 -msgid "Encrypt text" -msgstr "Crittografia del testo" - #: ../../include/permissions.php:13 msgid "Can view my \"public\" stream and posts" msgstr "Può vedere i miei contenuti \"pubblici\"" @@ -454,7 +285,7 @@ msgstr "Registrazione revocata per %s" #: ../../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:113 ../../include/items.php:3622 +#: ../../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 @@ -463,7 +294,7 @@ msgstr "Registrazione revocata per %s" #: ../../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:89 ../../mod/chat.php:94 +#: ../../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 @@ -477,14 +308,14 @@ msgstr "Registrazione revocata per %s" #: ../../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:860 ../../mod/layouts.php:27 +#: ../../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:176 ../../index.php:351 +#: ../../mod/notifications.php:66 ../../index.php:187 ../../index.php:362 msgid "Permission denied." msgstr "Permesso negato." @@ -526,7 +357,7 @@ msgstr "Mostra" msgid "Don't show" msgstr "Non mostrare" -#: ../../include/acl_selectors.php:246 ../../mod/chat.php:206 +#: ../../include/acl_selectors.php:246 ../../mod/chat.php:209 #: ../../mod/filestorage.php:126 ../../mod/photos.php:606 #: ../../mod/photos.php:949 msgid "Permissions" @@ -625,11 +456,11 @@ msgstr "scrittura su database fallita." msgid "Logged out." msgstr "Uscita effettuata." -#: ../../include/auth.php:197 +#: ../../include/auth.php:198 msgid "Failed authentication" msgstr "Autenticazione fallita" -#: ../../include/auth.php:212 ../../mod/openid.php:188 +#: ../../include/auth.php:213 ../../mod/openid.php:188 msgid "Login failed." msgstr "Accesso fallito." @@ -647,21 +478,21 @@ msgstr "Fine:" #: ../../include/bb2diaspora.php:455 ../../include/event.php:40 #: ../../include/identity.php:726 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:465 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:474 msgid "Location:" msgstr "Luogo:" -#: ../../include/bbcode.php:128 ../../include/bbcode.php:603 -#: ../../include/bbcode.php:606 ../../include/bbcode.php:611 -#: ../../include/bbcode.php:614 ../../include/bbcode.php:617 -#: ../../include/bbcode.php:620 ../../include/bbcode.php:625 -#: ../../include/bbcode.php:628 ../../include/bbcode.php:633 -#: ../../include/bbcode.php:636 ../../include/bbcode.php:639 -#: ../../include/bbcode.php:642 +#: ../../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:653 +#: ../../include/bbcode.php:163 ../../include/bbcode.php:683 msgid "Encrypted content" msgstr "Contenuto crittografato" @@ -669,19 +500,232 @@ msgstr "Contenuto crittografato" msgid "QR code" msgstr "QR code" -#: ../../include/bbcode.php:213 +#: ../../include/bbcode.php:219 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s ha scritto %2$s %3$s" -#: ../../include/bbcode.php:215 +#: ../../include/bbcode.php:221 msgid "post" msgstr "l'articolo" -#: ../../include/bbcode.php:571 ../../include/bbcode.php:591 +#: ../../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" @@ -699,11 +743,11 @@ msgstr "Il nome della chat è duplicato" msgid "Invalid room specifier." msgstr "Il nome della chat non è valido." -#: ../../include/chat.php:102 +#: ../../include/chat.php:105 msgid "Room not found." msgstr "Chat non trovata." -#: ../../include/chat.php:123 +#: ../../include/chat.php:126 msgid "Room is full" msgstr "La chat è al completo" @@ -857,323 +901,323 @@ msgstr "più recenti" msgid "newer" msgstr "più nuovi" -#: ../../include/text.php:719 +#: ../../include/text.php:729 msgid "No connections" msgstr "Nessun contatto" -#: ../../include/text.php:732 +#: ../../include/text.php:742 #, php-format msgid "%d Connection" msgid_plural "%d Connections" msgstr[0] "%d contatto" msgstr[1] "%d contatti" -#: ../../include/text.php:744 +#: ../../include/text.php:754 msgid "View Connections" msgstr "Elenco contatti" -#: ../../include/text.php:803 ../../include/text.php:817 +#: ../../include/text.php:813 ../../include/text.php:827 #: ../../include/nav.php:144 ../../mod/search.php:29 msgid "Search" msgstr "Cerca" -#: ../../include/text.php:805 ../../include/text.php:819 -#: ../../include/widgets.php:173 ../../mod/rbmark.php:28 +#: ../../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:885 +#: ../../include/text.php:895 msgid "poke" msgstr "poke" -#: ../../include/text.php:885 ../../include/conversation.php:240 +#: ../../include/text.php:895 ../../include/conversation.php:240 msgid "poked" msgstr "ha ricevuto un poke" -#: ../../include/text.php:886 +#: ../../include/text.php:896 msgid "ping" msgstr "ping" -#: ../../include/text.php:886 +#: ../../include/text.php:896 msgid "pinged" msgstr "ha ricevuto un ping" -#: ../../include/text.php:887 +#: ../../include/text.php:897 msgid "prod" msgstr "prod" -#: ../../include/text.php:887 +#: ../../include/text.php:897 msgid "prodded" msgstr "ha ricevuto un prod" -#: ../../include/text.php:888 +#: ../../include/text.php:898 msgid "slap" msgstr "schiaffo" -#: ../../include/text.php:888 +#: ../../include/text.php:898 msgid "slapped" msgstr "ha ricevuto uno schiaffo" -#: ../../include/text.php:889 +#: ../../include/text.php:899 msgid "finger" msgstr "finger" -#: ../../include/text.php:889 +#: ../../include/text.php:899 msgid "fingered" msgstr "ha ricevuto un finger" -#: ../../include/text.php:890 +#: ../../include/text.php:900 msgid "rebuff" msgstr "rifiuto" -#: ../../include/text.php:890 +#: ../../include/text.php:900 msgid "rebuffed" msgstr "ha ricevuto un rifiuto" -#: ../../include/text.php:899 +#: ../../include/text.php:909 msgid "happy" msgstr "allegro" -#: ../../include/text.php:900 +#: ../../include/text.php:910 msgid "sad" msgstr "triste" -#: ../../include/text.php:901 +#: ../../include/text.php:911 msgid "mellow" msgstr "calmo" -#: ../../include/text.php:902 +#: ../../include/text.php:912 msgid "tired" msgstr "stanco" -#: ../../include/text.php:903 +#: ../../include/text.php:913 msgid "perky" msgstr "vivace" -#: ../../include/text.php:904 +#: ../../include/text.php:914 msgid "angry" msgstr "arrabbiato" -#: ../../include/text.php:905 +#: ../../include/text.php:915 msgid "stupified" msgstr "stordito" -#: ../../include/text.php:906 +#: ../../include/text.php:916 msgid "puzzled" msgstr "confuso" -#: ../../include/text.php:907 +#: ../../include/text.php:917 msgid "interested" msgstr "attento" -#: ../../include/text.php:908 +#: ../../include/text.php:918 msgid "bitter" msgstr "amaro" -#: ../../include/text.php:909 +#: ../../include/text.php:919 msgid "cheerful" msgstr "allegro" -#: ../../include/text.php:910 +#: ../../include/text.php:920 msgid "alive" msgstr "vivace" -#: ../../include/text.php:911 +#: ../../include/text.php:921 msgid "annoyed" msgstr "seccato" -#: ../../include/text.php:912 +#: ../../include/text.php:922 msgid "anxious" msgstr "ansioso" -#: ../../include/text.php:913 +#: ../../include/text.php:923 msgid "cranky" msgstr "irritabile" -#: ../../include/text.php:914 +#: ../../include/text.php:924 msgid "disturbed" msgstr "turbato" -#: ../../include/text.php:915 +#: ../../include/text.php:925 msgid "frustrated" msgstr "frustrato" -#: ../../include/text.php:916 +#: ../../include/text.php:926 msgid "depressed" msgstr "in depressione" -#: ../../include/text.php:917 +#: ../../include/text.php:927 msgid "motivated" msgstr "motivato" -#: ../../include/text.php:918 +#: ../../include/text.php:928 msgid "relaxed" msgstr "rilassato" -#: ../../include/text.php:919 +#: ../../include/text.php:929 msgid "surprised" msgstr "sorpreso" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Monday" msgstr "lunedì" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Tuesday" msgstr "martedì" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Wednesday" msgstr "mercoledì" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Thursday" msgstr "giovedì" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Friday" msgstr "venerdì" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Saturday" msgstr "sabato" -#: ../../include/text.php:1080 +#: ../../include/text.php:1090 msgid "Sunday" msgstr "domenica" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "January" msgstr "gennaio" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "February" msgstr "febbraio" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "March" msgstr "marzo" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "April" msgstr "aprile" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "May" msgstr "maggio" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "June" msgstr "giugno" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "July" msgstr "luglio" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "August" msgstr "agosto" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "September" msgstr "settembre" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "October" msgstr "ottobre" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "November" msgstr "novembre" -#: ../../include/text.php:1084 +#: ../../include/text.php:1094 msgid "December" msgstr "dicembre" -#: ../../include/text.php:1162 +#: ../../include/text.php:1172 msgid "unknown.???" msgstr "sconosciuto???" -#: ../../include/text.php:1163 +#: ../../include/text.php:1173 msgid "bytes" msgstr "byte" -#: ../../include/text.php:1198 +#: ../../include/text.php:1208 msgid "remove category" msgstr "rimuovi la categoria" -#: ../../include/text.php:1247 +#: ../../include/text.php:1257 msgid "remove from file" msgstr "rimuovi dal file" -#: ../../include/text.php:1308 ../../include/text.php:1320 +#: ../../include/text.php:1318 ../../include/text.php:1330 msgid "Click to open/close" msgstr "Clicca per aprire/chiudere" -#: ../../include/text.php:1475 ../../mod/events.php:335 +#: ../../include/text.php:1485 ../../mod/events.php:344 msgid "link to source" msgstr "Link all'originale" -#: ../../include/text.php:1494 +#: ../../include/text.php:1504 msgid "Select a page layout: " msgstr "Scegli il layout della pagina:" -#: ../../include/text.php:1497 ../../include/text.php:1562 +#: ../../include/text.php:1507 ../../include/text.php:1572 msgid "default" msgstr "predefinito" -#: ../../include/text.php:1533 +#: ../../include/text.php:1543 msgid "Page content type: " msgstr "Contenuto della pagina:" -#: ../../include/text.php:1574 +#: ../../include/text.php:1584 msgid "Select an alternate language" msgstr "Seleziona una lingua diversa" -#: ../../include/text.php:1695 ../../include/conversation.php:117 +#: ../../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:1698 ../../include/conversation.php:120 +#: ../../include/text.php:1708 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "l'evento" -#: ../../include/text.php:1701 ../../include/conversation.php:145 +#: ../../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:1703 ../../include/conversation.php:147 +#: ../../include/text.php:1713 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "il commento" -#: ../../include/text.php:1708 +#: ../../include/text.php:1718 msgid "activity" msgstr "l'attività" -#: ../../include/text.php:1967 +#: ../../include/text.php:1977 msgid "Design" msgstr "Design" -#: ../../include/text.php:1969 +#: ../../include/text.php:1979 msgid "Blocks" msgstr "Riquadri" -#: ../../include/text.php:1970 +#: ../../include/text.php:1980 msgid "Menus" msgstr "Menù" -#: ../../include/text.php:1971 +#: ../../include/text.php:1981 msgid "Layouts" msgstr "Layout" -#: ../../include/text.php:1972 +#: ../../include/text.php:1982 msgid "Pages" msgstr "Pagine" @@ -1204,7 +1248,7 @@ msgstr "Entra in contatto" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Per esempio: Mario Rossi, Pesca" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:390 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:391 #: ../../mod/directory.php:206 ../../mod/directory.php:211 msgid "Find" msgstr "Cerca" @@ -1230,12 +1274,12 @@ msgid "Advanced Find" msgstr "Ricerca avanzata" #: ../../include/contact_widgets.php:58 ../../include/features.php:66 -#: ../../include/widgets.php:283 +#: ../../include/widgets.php:295 msgid "Saved Folders" msgstr "Cartelle salvate" #: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:95 -#: ../../include/widgets.php:286 +#: ../../include/widgets.php:298 msgid "Everything" msgstr "Tutto" @@ -1578,7 +1622,7 @@ msgstr "Ultimi articoli" msgid "Sort by Post Date" msgstr "Per data di creazione" -#: ../../include/conversation.php:1415 +#: ../../include/conversation.php:1415 ../../include/widgets.php:81 msgid "Personal" msgstr "Personali" @@ -1586,8 +1630,9 @@ msgstr "Personali" msgid "Posts that mention or involve you" msgstr "Articoli che ti riguardano o ti menzionano" -#: ../../include/conversation.php:1424 ../../mod/connections.php:211 -#: ../../mod/connections.php:223 ../../mod/menu.php:61 +#: ../../include/conversation.php:1424 ../../include/widgets.php:83 +#: ../../mod/connections.php:211 ../../mod/connections.php:224 +#: ../../mod/menu.php:61 msgid "New" msgstr "Novità" @@ -1627,11 +1672,6 @@ msgstr "Informazioni" msgid "Profile Details" msgstr "Dettagli del profilo" -#: ../../include/conversation.php:1501 ../../include/nav.php:84 -#: ../../mod/fbrowser.php:25 -msgid "Photos" -msgstr "Foto" - #: ../../include/conversation.php:1510 ../../include/nav.php:85 #: ../../mod/fbrowser.php:114 msgid "Files" @@ -1645,11 +1685,6 @@ msgstr "Archivio file" msgid "Chatrooms" msgstr "Chat" -#: ../../include/conversation.php:1532 ../../include/nav.php:87 -#: ../../include/nav.php:180 ../../mod/events.php:357 -msgid "Events" -msgstr "Eventi" - #: ../../include/conversation.php:1535 msgid "Events and Calendar" msgstr "Calendario eventi" @@ -2048,7 +2083,7 @@ msgstr "Anteprima articolo" msgid "Allow previewing posts and comments before publishing them" msgstr "Abilita l'anteprima degli articoli e dei commenti prima di pubblicarli" -#: ../../include/features.php:43 ../../include/widgets.php:490 +#: ../../include/features.php:43 ../../include/widgets.php:502 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "Sorgenti del canale" @@ -2086,7 +2121,7 @@ msgstr "Filtra per insiemi di canali" msgid "Enable widget to display Network posts only from selected collections" msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali" -#: ../../include/features.php:52 ../../include/widgets.php:252 +#: ../../include/features.php:52 ../../include/widgets.php:264 msgid "Saved Searches" msgstr "Ricerche salvate" @@ -2210,19 +2245,6 @@ msgstr "l'account locale non è stato trovato." msgid "Cannot connect to yourself." msgstr "Non puoi connetterti a te stesso." -#: ../../include/zot.php:583 -msgid "Invalid data packet" -msgstr "Dati non validi" - -#: ../../include/zot.php:593 -msgid "Unable to verify channel signature" -msgstr "Impossibile verificare la firma elettronica del canale" - -#: ../../include/zot.php:790 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "Impossibile verificare la firma elettronica del sito %s" - #: ../../include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -2258,11 +2280,11 @@ msgstr "Crea un nuovo insieme" msgid "Channels not in any collection" msgstr "Canali che non sono in un insieme" -#: ../../include/group.php:290 ../../include/widgets.php:253 +#: ../../include/group.php:290 ../../include/widgets.php:265 msgid "add" msgstr "aggiungi" -#: ../../include/identity.php:30 ../../mod/item.php:1232 +#: ../../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" @@ -2300,7 +2322,7 @@ msgid "Default Profile" msgstr "Profilo predefinito" #: ../../include/identity.php:342 ../../include/profile_selectors.php:42 -#: ../../include/widgets.php:387 ../../mod/connedit.php:431 +#: ../../include/widgets.php:399 ../../mod/connedit.php:431 msgid "Friends" msgstr "Amici" @@ -2400,11 +2422,6 @@ msgstr "Promemoria" msgid "Events this week:" msgstr "Eventi di questa settimana:" -#: ../../include/identity.php:942 ../../include/identity.php:1031 -#: ../../mod/profperm.php:112 -msgid "Profile" -msgstr "Profilo" - #: ../../include/identity.php:950 ../../mod/settings.php:937 msgid "Full Name:" msgstr "Nome completo:" @@ -2502,42 +2519,42 @@ msgstr "Lavoro:" msgid "School/education:" msgstr "Scuola:" -#: ../../include/items.php:281 ../../mod/profperm.php:23 +#: ../../include/items.php:306 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:63 -#: ../../index.php:350 +#: ../../index.php:361 msgid "Permission denied" msgstr "Permesso negato" -#: ../../include/items.php:805 +#: ../../include/items.php:830 msgid "(Unknown)" msgstr "(Sconosciuto)" -#: ../../include/items.php:3560 ../../mod/admin.php:159 +#: ../../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:3984 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4007 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "Insieme non trovato." -#: ../../include/items.php:3999 +#: ../../include/items.php:4022 msgid "Collection is empty." msgstr "L'insieme di canali è vuoto." -#: ../../include/items.php:4006 +#: ../../include/items.php:4029 #, php-format msgid "Collection: %s" msgstr "Insieme: %s" -#: ../../include/items.php:4017 +#: ../../include/items.php:4040 #, php-format msgid "Connection: %s" msgstr "Contatto: %s" -#: ../../include/items.php:4020 +#: ../../include/items.php:4043 msgid "Connection not found." msgstr "Contatto non trovato." @@ -2581,76 +2598,80 @@ msgstr "Suggerimento per la chiave segreta" msgid "Notice: Permissions have changed but have not yet been submitted." msgstr "Nota: i permessi sono stati modificati ma non ancora salvati." -#: ../../include/js_strings.php:18 +#: ../../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:19 +#: ../../include/js_strings.php:20 msgid "timeago.prefixFromNow" msgstr "timeago.prefixFromNow" -#: ../../include/js_strings.php:20 +#: ../../include/js_strings.php:21 msgid "ago" msgstr "fa" -#: ../../include/js_strings.php:21 +#: ../../include/js_strings.php:22 msgid "from now" msgstr "da adesso" -#: ../../include/js_strings.php:22 +#: ../../include/js_strings.php:23 msgid "less than a minute" msgstr "meno di un minuto" -#: ../../include/js_strings.php:23 +#: ../../include/js_strings.php:24 msgid "about a minute" msgstr "circa un minuto" -#: ../../include/js_strings.php:24 +#: ../../include/js_strings.php:25 #, php-format msgid "%d minutes" msgstr "%d minuti" -#: ../../include/js_strings.php:25 +#: ../../include/js_strings.php:26 msgid "about an hour" msgstr "circa un’ora" -#: ../../include/js_strings.php:26 +#: ../../include/js_strings.php:27 #, php-format msgid "about %d hours" msgstr "circa %d ore" -#: ../../include/js_strings.php:27 +#: ../../include/js_strings.php:28 msgid "a day" msgstr "un giorno" -#: ../../include/js_strings.php:28 +#: ../../include/js_strings.php:29 #, php-format msgid "%d days" msgstr "%d giorni" -#: ../../include/js_strings.php:29 +#: ../../include/js_strings.php:30 msgid "about a month" msgstr "circa un mese" -#: ../../include/js_strings.php:30 +#: ../../include/js_strings.php:31 #, php-format msgid "%d months" msgstr "%d mesi" -#: ../../include/js_strings.php:31 +#: ../../include/js_strings.php:32 msgid "about a year" msgstr "circa un anno" -#: ../../include/js_strings.php:32 +#: ../../include/js_strings.php:33 #, php-format msgid "%d years" msgstr "%d anni" -#: ../../include/js_strings.php:33 +#: ../../include/js_strings.php:34 msgid " " msgstr " " -#: ../../include/js_strings.php:34 +#: ../../include/js_strings.php:35 msgid "timeago.numbers" msgstr "timeago.numbers" @@ -2763,7 +2784,7 @@ msgstr "Guida" msgid "Help and documentation" msgstr "Guida e documentazione" -#: ../../include/nav.php:142 +#: ../../include/nav.php:142 ../../mod/apps.php:17 msgid "Apps" msgstr "Apps" @@ -2775,18 +2796,10 @@ msgstr "App, strumenti e giochi aggiuntivi" msgid "Search site content" msgstr "Cerca nel sito" -#: ../../include/nav.php:147 ../../mod/directory.php:210 -msgid "Directory" -msgstr "Tutti i canali" - #: ../../include/nav.php:147 msgid "Channel Locator" msgstr "Ricerca canali" -#: ../../include/nav.php:158 -msgid "Matrix" -msgstr "La tua rete" - #: ../../include/nav.php:158 msgid "Your matrix" msgstr "La tua rete" @@ -2795,10 +2808,6 @@ msgstr "La tua rete" msgid "Mark all matrix notifications seen" msgstr "Segna come lette le notifiche della tua rete" -#: ../../include/nav.php:161 -msgid "Channel Home" -msgstr "Bacheca del canale" - #: ../../include/nav.php:161 msgid "Channel home" msgstr "Bacheca del canale" @@ -2808,7 +2817,7 @@ msgid "Mark all channel notifications seen" msgstr "Segna come lette le notifiche dei canali" #: ../../include/nav.php:165 ../../include/nav.php:188 -#: ../../mod/connections.php:384 +#: ../../mod/connections.php:385 msgid "Connections" msgstr "Contatti" @@ -2824,7 +2833,7 @@ msgstr "Notifiche" msgid "See all notifications" msgstr "Vedi tutte le notifiche" -#: ../../include/nav.php:170 +#: ../../include/nav.php:170 ../../mod/notifications.php:99 msgid "Mark all system notifications seen" msgstr "Segna come lette le notifiche di sistema" @@ -2852,7 +2861,7 @@ msgstr "In arrivo" msgid "Outbox" msgstr "Inviati" -#: ../../include/nav.php:177 ../../include/widgets.php:523 +#: ../../include/nav.php:177 ../../include/widgets.php:535 msgid "New Message" msgstr "Nuovo messaggio" @@ -2876,7 +2885,7 @@ msgstr "Gestisci i canali" msgid "Manage Your Channels" msgstr "Gestisci i contatti dei tuoi canali" -#: ../../include/nav.php:186 ../../include/widgets.php:501 +#: ../../include/nav.php:186 ../../include/widgets.php:513 #: ../../mod/admin.php:976 ../../mod/admin.php:1181 msgid "Settings" msgstr "Impostazioni" @@ -2909,15 +2918,15 @@ msgstr "Attendere..." msgid "view full size" msgstr "guarda nelle dimensioni reali" -#: ../../include/plugin.php:475 ../../include/plugin.php:477 +#: ../../include/plugin.php:486 ../../include/plugin.php:488 msgid "Click here to upgrade." msgstr "Clicca qui per aggiornare." -#: ../../include/plugin.php:483 +#: ../../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:488 +#: ../../include/plugin.php:499 msgid "This action is not available under your subscription plan." msgstr "Questa operazione non è prevista dal tuo abbonamento." @@ -3149,134 +3158,159 @@ msgstr "Chi se ne frega" msgid "Ask me" msgstr "Chiedimelo" -#: ../../include/reddav.php:1069 +#: ../../include/reddav.php:1045 msgid "Edit File properties" msgstr "Modifica le proprietà dei file" -#: ../../include/security.php:295 +#: ../../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:117 ../../mod/suggest.php:53 +#: ../../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:123 ../../mod/connections.php:265 +#: ../../include/widgets.php:135 ../../mod/connections.php:266 msgid "Suggestions" msgstr "Suggerimenti" -#: ../../include/widgets.php:124 +#: ../../include/widgets.php:136 msgid "See more..." msgstr "Altro..." -#: ../../include/widgets.php:146 +#: ../../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:152 +#: ../../include/widgets.php:164 msgid "Add New Connection" msgstr "Aggiungi un contatto" -#: ../../include/widgets.php:153 +#: ../../include/widgets.php:165 msgid "Enter the channel address" msgstr "Scrivi l'indirizzo del canale" -#: ../../include/widgets.php:154 +#: ../../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:171 +#: ../../include/widgets.php:183 msgid "Notes" msgstr "Note" -#: ../../include/widgets.php:243 +#: ../../include/widgets.php:255 msgid "Remove term" msgstr "Rimuovi termine" -#: ../../include/widgets.php:322 +#: ../../include/widgets.php:334 msgid "Archives" msgstr "Archivi" -#: ../../include/widgets.php:384 +#: ../../include/widgets.php:396 msgid "Refresh" msgstr "Aggiorna" -#: ../../include/widgets.php:385 ../../mod/connedit.php:428 +#: ../../include/widgets.php:397 ../../mod/connedit.php:428 msgid "Me" msgstr "Io" -#: ../../include/widgets.php:386 ../../mod/connedit.php:430 +#: ../../include/widgets.php:398 ../../mod/connedit.php:430 msgid "Best Friends" msgstr "Buoni amici" -#: ../../include/widgets.php:388 +#: ../../include/widgets.php:400 msgid "Co-workers" msgstr "Colleghi" -#: ../../include/widgets.php:389 ../../mod/connedit.php:432 +#: ../../include/widgets.php:401 ../../mod/connedit.php:432 msgid "Former Friends" msgstr "Ex amici" -#: ../../include/widgets.php:390 ../../mod/connedit.php:433 +#: ../../include/widgets.php:402 ../../mod/connedit.php:433 msgid "Acquaintances" msgstr "Conoscenti" -#: ../../include/widgets.php:391 +#: ../../include/widgets.php:403 msgid "Everybody" msgstr "Tutti" -#: ../../include/widgets.php:423 +#: ../../include/widgets.php:435 msgid "Account settings" msgstr "Impostazioni dell'account" -#: ../../include/widgets.php:429 +#: ../../include/widgets.php:441 msgid "Channel settings" msgstr "Impostazioni del canale" -#: ../../include/widgets.php:435 +#: ../../include/widgets.php:447 msgid "Additional features" msgstr "Funzionalità aggiuntive" -#: ../../include/widgets.php:441 +#: ../../include/widgets.php:453 msgid "Feature settings" msgstr "Impostazioni aggiuntive" -#: ../../include/widgets.php:447 +#: ../../include/widgets.php:459 msgid "Display settings" msgstr "Impostazioni grafiche" -#: ../../include/widgets.php:453 +#: ../../include/widgets.php:465 msgid "Connected apps" msgstr "App connesse" -#: ../../include/widgets.php:459 +#: ../../include/widgets.php:471 msgid "Export channel" msgstr "Esporta il canale" -#: ../../include/widgets.php:471 +#: ../../include/widgets.php:483 msgid "Automatic Permissions (Advanced)" msgstr "Permessi predefiniti (avanzato)" -#: ../../include/widgets.php:481 +#: ../../include/widgets.php:493 msgid "Premium Channel Settings" msgstr "Canale premium - impostazioni" -#: ../../include/widgets.php:518 +#: ../../include/widgets.php:530 msgid "Check Mail" msgstr "Controlla i messaggi" -#: ../../include/widgets.php:599 +#: ../../include/widgets.php:611 msgid "Chat Rooms" msgstr "Chat attive" -#: ../../include/widgets.php:617 +#: ../../include/widgets.php:629 msgid "Bookmarked Chatrooms" msgstr "Chat nei segnalibri" -#: ../../include/widgets.php:635 +#: ../../include/widgets.php:647 msgid "Suggested Chatrooms" msgstr "Chat suggerite" @@ -4101,14 +4135,6 @@ msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a ques msgid "Welcome %s. Remote authentication successful." msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo." -#: ../../mod/apps.php:8 -msgid "No installed applications." -msgstr "Nessuna app installata." - -#: ../../mod/apps.php:13 -msgid "Applications" -msgstr "Applicazioni" - #: ../../mod/attach.php:9 msgid "Item not available." msgstr "Elemento non disponibile." @@ -4128,7 +4154,7 @@ msgid "Channel not found." msgstr "Canale non trovato." #: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:100 -#: ../../mod/help.php:72 ../../index.php:226 +#: ../../mod/help.php:72 ../../index.php:237 msgid "Page not found." msgstr "Pagina non trovata." @@ -4249,14 +4275,6 @@ msgstr "Stato sentimentale" msgid "Romantic Partner" msgstr "Partner affettivo" -#: ../../mod/profiles.php:302 -msgid "Likes" -msgstr "Mi piace" - -#: ../../mod/profiles.php:306 -msgid "Dislikes" -msgstr "Non mi piace" - #: ../../mod/profiles.php:310 msgid "Work/Employment" msgstr "Lavoro/impiego" @@ -4493,7 +4511,7 @@ msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo." msgid "Visible To" msgstr "Visibile a" -#: ../../mod/profperm.php:139 ../../mod/connections.php:277 +#: ../../mod/profperm.php:139 ../../mod/connections.php:278 msgid "All Connections" msgstr "Tutti i contatti" @@ -4554,35 +4572,39 @@ msgstr "Descrizione" msgid "Or enter new bookmark folder name" msgstr "O inserisci il nome di una nuova cartella di segnalibri" -#: ../../mod/chat.php:166 +#: ../../mod/chat.php:167 msgid "Room not found" msgstr "Chat non trovata" -#: ../../mod/chat.php:176 +#: ../../mod/chat.php:178 msgid "Leave Room" msgstr "Lascia la chat" -#: ../../mod/chat.php:177 +#: ../../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:178 +#: ../../mod/chat.php:181 msgid "I am online" msgstr "Sono online" -#: ../../mod/chat.php:180 +#: ../../mod/chat.php:183 msgid "Bookmark this room" msgstr "Aggiungi chat ai segnalibri" -#: ../../mod/chat.php:204 ../../mod/chat.php:226 +#: ../../mod/chat.php:207 ../../mod/chat.php:229 msgid "New Chatroom" msgstr "Nuova chat" -#: ../../mod/chat.php:205 +#: ../../mod/chat.php:208 msgid "Chatroom Name" msgstr "Nome della chat" -#: ../../mod/chat.php:222 +#: ../../mod/chat.php:225 #, php-format msgid "%1$s's Chatrooms" msgstr "Le chat di %1$s" @@ -4827,88 +4849,88 @@ msgstr "Contatto aggiornato." msgid "Failed to update connection record." msgstr "Impossibile aggiornare le informazioni del contatto." -#: ../../mod/connections.php:191 ../../mod/connections.php:290 +#: ../../mod/connections.php:191 ../../mod/connections.php:291 msgid "Blocked" msgstr "Bloccati" -#: ../../mod/connections.php:196 ../../mod/connections.php:297 +#: ../../mod/connections.php:196 ../../mod/connections.php:298 msgid "Ignored" msgstr "Ignorati" -#: ../../mod/connections.php:201 ../../mod/connections.php:311 +#: ../../mod/connections.php:201 ../../mod/connections.php:312 msgid "Hidden" msgstr "Nascosti" -#: ../../mod/connections.php:206 ../../mod/connections.php:304 +#: ../../mod/connections.php:206 ../../mod/connections.php:305 msgid "Archived" msgstr "Archiviati" -#: ../../mod/connections.php:229 ../../mod/connections.php:243 +#: ../../mod/connections.php:230 ../../mod/connections.php:244 msgid "All" msgstr "Tutti" -#: ../../mod/connections.php:238 ../../mod/connections.php:318 +#: ../../mod/connections.php:239 ../../mod/connections.php:319 msgid "Unconnected" msgstr "Non connesso" -#: ../../mod/connections.php:268 +#: ../../mod/connections.php:269 msgid "Suggest new connections" msgstr "Suggerisci nuovi contatti" -#: ../../mod/connections.php:271 +#: ../../mod/connections.php:272 msgid "New Connections" msgstr "Nuovi contatti" -#: ../../mod/connections.php:274 +#: ../../mod/connections.php:275 msgid "Show pending (new) connections" msgstr "Richieste di contatto in attesa" -#: ../../mod/connections.php:280 +#: ../../mod/connections.php:281 msgid "Show all connections" msgstr "Mostra tutti i contatti" -#: ../../mod/connections.php:283 +#: ../../mod/connections.php:284 msgid "Unblocked" msgstr "Non bloccati" -#: ../../mod/connections.php:286 +#: ../../mod/connections.php:287 msgid "Only show unblocked connections" msgstr "Mostra solo i contatti non bloccati" -#: ../../mod/connections.php:293 +#: ../../mod/connections.php:294 msgid "Only show blocked connections" msgstr "Mostra solo i contatti bloccati" -#: ../../mod/connections.php:300 +#: ../../mod/connections.php:301 msgid "Only show ignored connections" msgstr "Mostra solo i contatti ignorati" -#: ../../mod/connections.php:307 +#: ../../mod/connections.php:308 msgid "Only show archived connections" msgstr "Mostra solo i contatti archiviati" -#: ../../mod/connections.php:314 +#: ../../mod/connections.php:315 msgid "Only show hidden connections" msgstr "Mostra solo i contatti nascosti" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:322 msgid "Only show one-way connections" msgstr "Mostra solo i contatti non ricambiati" -#: ../../mod/connections.php:366 +#: ../../mod/connections.php:367 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../mod/connections.php:367 +#: ../../mod/connections.php:368 msgid "Edit contact" msgstr "Modifica il contatto" -#: ../../mod/connections.php:388 +#: ../../mod/connections.php:389 msgid "Search your connections" msgstr "Cerca tra i contatti" -#: ../../mod/connections.php:389 +#: ../../mod/connections.php:390 msgid "Finding: " msgstr "Ricerca: " @@ -5771,7 +5793,7 @@ msgid "" "phpmyadmin or mysql." msgstr "Potresti dover importare il file 'install/database.sql' manualmente usando phpmyadmin o mysql." -#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:641 +#: ../../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'." @@ -5779,7 +5801,7 @@ msgstr "Leggi il file 'install/INSTALL.txt'." msgid "System check" msgstr "Verifica del sistema" -#: ../../mod/setup.php:261 ../../mod/events.php:360 +#: ../../mod/setup.php:261 ../../mod/events.php:369 msgid "Next" msgstr "Successivo" @@ -6052,71 +6074,73 @@ msgstr "Red usa un archivio per salvare i file caricati. Il server deve avere i msgid "store is writable" msgstr "l'archivio è scrivibile" -#: ../../mod/setup.php:554 +#: ../../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:555 +#: ../../mod/setup.php:570 msgid "" -"If you use https access, you MUST use a certification instance known by all " -"internet browsers. You MUST NOT use self-signed certificates!" -msgstr "Se abiliti https, DEVI usare un certificato riconosciuto da tutti i browser internet. NON DEVI usare certificati self-signed!" +"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:556 +#: ../../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. If your" -msgstr "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server, per esempio." +"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:557 +#: ../../mod/setup.php:572 msgid "" -"certificate is not known by the internet browser of users they get a warning" -" message complaining about some security issues. Although" -msgstr "Se il tuo certificato non è riconosciuto dai browser, chi ti legge riceverà degli avvisi di sicurezza." +"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:558 +#: ../../mod/setup.php:573 msgid "" -"these complains are not the real truth - there are no security issues with " -"your encryption! - the users may be confused, nerved or even" -msgstr "Anche se questi avvisi non indicano problemi reali - la tua crittografia non ha veramente problemi di sicurezza! - gli utenti potrebbero restarne confusi o preoccupati." +"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:559 +#: ../../mod/setup.php:574 msgid "" -"worse may become scared about redmatrix having security issues. Use one of " -"the free certification instances!" -msgstr "Oppure potrebbero anche pensare che sia redmatrix in generale ad avere problemi di sicurezza. Puoi usare un certificato gratuito!" +"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:561 +#: ../../mod/setup.php:576 msgid "SSL certificate validation" msgstr "Validazione del certificato SSL" -#: ../../mod/setup.php:568 +#: ../../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:570 +#: ../../mod/setup.php:584 msgid "Url rewrite is working" msgstr "Url rewrite funziona correttamente" -#: ../../mod/setup.php:580 +#: ../../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:604 +#: ../../mod/setup.php:618 msgid "Errors encountered creating database tables." msgstr "La creazione delle tabelle del database ha generato errori." -#: ../../mod/setup.php:639 +#: ../../mod/setup.php:653 msgid "

What next

" msgstr "

I prossimi passi

" -#: ../../mod/setup.php:640 +#: ../../mod/setup.php:654 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the " "poller." @@ -6258,64 +6282,64 @@ msgstr "Amministratori del sito" msgid "Event title and start time are required." msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento." -#: ../../mod/events.php:290 +#: ../../mod/events.php:299 msgid "l, F j" msgstr "l j F" -#: ../../mod/events.php:312 +#: ../../mod/events.php:321 msgid "Edit event" msgstr "Modifica l'evento" -#: ../../mod/events.php:358 +#: ../../mod/events.php:367 msgid "Create New Event" msgstr "Crea un nuovo evento" -#: ../../mod/events.php:359 +#: ../../mod/events.php:368 msgid "Previous" msgstr "Precendente" -#: ../../mod/events.php:431 +#: ../../mod/events.php:439 msgid "hour:minute" msgstr "ora:minuti" -#: ../../mod/events.php:450 +#: ../../mod/events.php:459 msgid "Event details" msgstr "Dettagli evento" -#: ../../mod/events.php:451 +#: ../../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:453 +#: ../../mod/events.php:462 msgid "Event Starts:" msgstr "Inizio:" -#: ../../mod/events.php:453 ../../mod/events.php:467 +#: ../../mod/events.php:462 ../../mod/events.php:476 msgid "Required" msgstr "Obbligatorio" -#: ../../mod/events.php:456 +#: ../../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:458 +#: ../../mod/events.php:467 msgid "Event Finishes:" msgstr "Fine:" -#: ../../mod/events.php:461 +#: ../../mod/events.php:470 msgid "Adjust for viewer timezone" msgstr "Adatta al fuso orario di chi legge" -#: ../../mod/events.php:463 +#: ../../mod/events.php:472 msgid "Description:" msgstr "Descrizione:" -#: ../../mod/events.php:467 +#: ../../mod/events.php:476 msgid "Title:" msgstr "Titolo:" -#: ../../mod/events.php:469 +#: ../../mod/events.php:478 msgid "Share this event" msgstr "Condividi questo evento" @@ -6523,7 +6547,7 @@ msgstr "%1$s ha taggato %3$s di %2$s con %4$s" msgid "Help:" msgstr "Guida:" -#: ../../mod/help.php:69 ../../index.php:223 +#: ../../mod/help.php:69 ../../index.php:234 msgid "Not Found" msgstr "Non disponibile" @@ -6763,24 +6787,24 @@ msgstr "Per saperne di più sul progetto Red Matrix e sul perché potrebbe cambi msgid "Unable to locate original post." msgstr "Impossibile trovare il messaggio originale." -#: ../../mod/item.php:345 +#: ../../mod/item.php:352 msgid "Empty post discarded." msgstr "L'articolo vuoto è stato ignorato." -#: ../../mod/item.php:385 +#: ../../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:794 +#: ../../mod/item.php:806 msgid "System error. Post not saved." msgstr "Errore di sistema. Articolo non salvato." -#: ../../mod/item.php:1237 +#: ../../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:1243 +#: ../../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." @@ -6806,16 +6830,16 @@ msgstr "Le informazioni remote sulla privacy non sono disponibili." msgid "Visible to:" msgstr "Visibile a:" -#: ../../mod/viewconnections.php:50 +#: ../../mod/viewconnections.php:58 msgid "No connections." msgstr "Nessun contatto." -#: ../../mod/viewconnections.php:62 +#: ../../mod/viewconnections.php:70 #, php-format msgid "Visit %s's profile [%s]" msgstr "Visita il profilo di %s [%s]" -#: ../../mod/viewconnections.php:77 +#: ../../mod/viewconnections.php:85 msgid "View Connnections" msgstr "Guarda i contatti" @@ -7289,11 +7313,11 @@ msgstr "L'identificativo della richiesta non è valido." msgid "Discard" msgstr "Rifiuta" -#: ../../mod/notifications.php:93 ../../mod/notify.php:54 +#: ../../mod/notifications.php:94 ../../mod/notify.php:54 msgid "No more system notifications." msgstr "Non ci sono nuove notifiche di sistema." -#: ../../mod/notifications.php:97 ../../mod/notify.php:58 +#: ../../mod/notifications.php:98 ../../mod/notify.php:58 msgid "System Notifications" msgstr "Notifiche di sistema" @@ -7539,8 +7563,8 @@ msgid "Set the border colour of comments" msgstr "Imposta il colore del bordo dei commenti" #: ../../view/theme/redbasic/php/config.php:120 -msgid "Set the opacity of items" -msgstr "Opacità degli oggetti" +msgid "Set the indent for comments" +msgstr "Imposta il lo spostamento a destra dei commenti" #: ../../view/theme/redbasic/php/config.php:121 msgid "Set the basic colour for item icons" diff --git a/view/it/strings.php b/view/it/strings.php index 9ce09e00a..c288b2ff1 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -6,6 +6,12 @@ function string_plural_select_it($n){ ; $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'"; $a->strings["Profile Photos"] = "Foto del profilo"; +$a->strings["Matrix"] = "La tua rete"; +$a->strings["Channel Home"] = "Bacheca del canale"; +$a->strings["Profile"] = "Profilo"; +$a->strings["Photos"] = "Foto"; +$a->strings["Events"] = "Eventi"; +$a->strings["Directory"] = "Tutti i canali"; $a->strings["Embedded content"] = "Contenuti incorporati"; $a->strings["Embedding disabled"] = "Contenuti incorporati - funzione disabilitata"; $a->strings["created a new post"] = "Ha creato un nuovo articolo"; @@ -22,49 +28,6 @@ $a->strings["Page Link"] = "Link alla pagina"; $a->strings["Title"] = "Titolo"; $a->strings["Created"] = "Creato"; $a->strings["Edited"] = "Modificato"; -$a->strings["Private Message"] = "Messaggio privato"; -$a->strings["Delete"] = "Elimina"; -$a->strings["Select"] = "Seleziona"; -$a->strings["save to folder"] = "salva in una cartella"; -$a->strings["add star"] = "aggiungi ai preferiti"; -$a->strings["remove star"] = "rimuovi dai preferiti"; -$a->strings["toggle star status"] = "Attiva/disattiva preferito"; -$a->strings["starred"] = "preferito"; -$a->strings["Message is verified"] = "Messaggio verificato"; -$a->strings["add tag"] = "Aggiungi tag"; -$a->strings["I like this (toggle)"] = "Attiva/disattiva Mi piace"; -$a->strings["like"] = "mi piace"; -$a->strings["I don't like this (toggle)"] = "Attiva/disattiva Non mi piace"; -$a->strings["dislike"] = "non mi piace"; -$a->strings["Share this"] = "Condividi"; -$a->strings["share"] = "condividi"; -$a->strings["View %s's profile - %s"] = "Guarda il profilo di %s - %s"; -$a->strings["to"] = "a"; -$a->strings["via"] = "via"; -$a->strings["Wall-to-Wall"] = "Da bacheca a bacheca"; -$a->strings["via Wall-To-Wall:"] = "da bacheca a bacheca:"; -$a->strings[" from %s"] = " da %s"; -$a->strings["last edited: %s"] = "ultima modifica: %s"; -$a->strings["Expires: %s"] = "Scadenza: %s"; -$a->strings["Bookmark Links"] = "I link dei segnalibri"; -$a->strings["Please wait"] = "Attendere"; -$a->strings["%d comment"] = array( - 0 => "%d commento", - 1 => "%d commenti", -); -$a->strings["show more"] = "mostra tutto"; -$a->strings["This is you"] = "Questo sei tu"; -$a->strings["Comment"] = "Commento"; -$a->strings["Submit"] = "Salva"; -$a->strings["Bold"] = "Grassetto"; -$a->strings["Italic"] = "Corsivo"; -$a->strings["Underline"] = "Sottolineato"; -$a->strings["Quote"] = "Citazione"; -$a->strings["Code"] = "Codice"; -$a->strings["Image"] = "Immagine"; -$a->strings["Link"] = "Link"; -$a->strings["Video"] = "Video"; -$a->strings["Encrypt text"] = "Crittografia del testo"; $a->strings["Can view my \"public\" stream and posts"] = "Può vedere i miei contenuti \"pubblici\""; $a->strings["Can view my \"public\" channel profile"] = "Può vedere il profilo del mio canale \"pubblico\""; $a->strings["Can view my \"public\" photo albums"] = "Può vedere il mio album fotografico \"pubblico\""; @@ -143,6 +106,53 @@ $a->strings["QR code"] = "QR code"; $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s %3\$s"; $a->strings["post"] = "l'articolo"; $a->strings["$1 wrote:"] = "$1 ha scritto:"; +$a->strings["Private Message"] = "Messaggio privato"; +$a->strings["Delete"] = "Elimina"; +$a->strings["Select"] = "Seleziona"; +$a->strings["save to folder"] = "salva in una cartella"; +$a->strings["Like"] = "Mi piace"; +$a->strings["Likes"] = "Mi piace"; +$a->strings["Dislike"] = "Non mi piace"; +$a->strings["Dislikes"] = "Non mi piace"; +$a->strings["add star"] = "aggiungi ai preferiti"; +$a->strings["remove star"] = "rimuovi dai preferiti"; +$a->strings["toggle star status"] = "Attiva/disattiva preferito"; +$a->strings["starred"] = "preferito"; +$a->strings["Message is verified"] = "Messaggio verificato"; +$a->strings["add tag"] = "Aggiungi tag"; +$a->strings["I like this (toggle)"] = "Attiva/disattiva Mi piace"; +$a->strings["like"] = "mi piace"; +$a->strings["I don't like this (toggle)"] = "Attiva/disattiva Non mi piace"; +$a->strings["dislike"] = "non mi piace"; +$a->strings["Share this"] = "Condividi"; +$a->strings["share"] = "condividi"; +$a->strings["View %s's profile - %s"] = "Guarda il profilo di %s - %s"; +$a->strings["to"] = "a"; +$a->strings["via"] = "via"; +$a->strings["Wall-to-Wall"] = "Da bacheca a bacheca"; +$a->strings["via Wall-To-Wall:"] = "da bacheca a bacheca:"; +$a->strings[" from %s"] = " da %s"; +$a->strings["last edited: %s"] = "ultima modifica: %s"; +$a->strings["Expires: %s"] = "Scadenza: %s"; +$a->strings["Bookmark Links"] = "I link dei segnalibri"; +$a->strings["Please wait"] = "Attendere"; +$a->strings["%d comment"] = array( + 0 => "%d commento", + 1 => "%d commenti", +); +$a->strings["show more"] = "mostra tutto"; +$a->strings["This is you"] = "Questo sei tu"; +$a->strings["Comment"] = "Commento"; +$a->strings["Submit"] = "Salva"; +$a->strings["Bold"] = "Grassetto"; +$a->strings["Italic"] = "Corsivo"; +$a->strings["Underline"] = "Sottolineato"; +$a->strings["Quote"] = "Citazione"; +$a->strings["Code"] = "Codice"; +$a->strings["Image"] = "Immagine"; +$a->strings["Link"] = "Link"; +$a->strings["Video"] = "Video"; +$a->strings["Encrypt text"] = "Crittografia del testo"; $a->strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s"; $a->strings["Missing room name"] = "Chat senza nome"; $a->strings["Duplicate room name"] = "Il nome della chat è duplicato"; @@ -379,11 +389,9 @@ $a->strings["Channel"] = "Canale"; $a->strings["Status Messages and Posts"] = "Articoli e messaggi di stato"; $a->strings["About"] = "Informazioni"; $a->strings["Profile Details"] = "Dettagli del profilo"; -$a->strings["Photos"] = "Foto"; $a->strings["Files"] = "Elenco file"; $a->strings["Files and Storage"] = "Archivio file"; $a->strings["Chatrooms"] = "Chat"; -$a->strings["Events"] = "Eventi"; $a->strings["Events and Calendar"] = "Calendario eventi"; $a->strings["Bookmarks"] = "Segnalibri"; $a->strings["Saved Bookmarks"] = "Segnalibri salvati"; @@ -513,9 +521,6 @@ $a->strings["Channel was deleted and no longer exists."] = "Il canale è stato r $a->strings["Channel discovery failed."] = "La ricerca del canale non ha avuto successo."; $a->strings["local account not found."] = "l'account locale non è stato trovato."; $a->strings["Cannot connect to yourself."] = "Non puoi connetterti a te stesso."; -$a->strings["Invalid data packet"] = "Dati non validi"; -$a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale"; -$a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s"; $a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti potrebbero rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso."; $a->strings["Default privacy group for new contacts"] = "Insieme predefinito per i canali che inizi a seguire"; $a->strings["All Channels"] = "Tutti i canali"; @@ -557,7 +562,6 @@ $a->strings["Birthdays this week:"] = "Compleanni questa settimana:"; $a->strings["[No description]"] = "[Nessuna descrizione]"; $a->strings["Event Reminders"] = "Promemoria"; $a->strings["Events this week:"] = "Eventi di questa settimana:"; -$a->strings["Profile"] = "Profilo"; $a->strings["Full Name:"] = "Nome completo:"; $a->strings["j F, Y"] = "j F Y"; $a->strings["j F"] = "j F"; @@ -600,6 +604,7 @@ $a->strings["everybody"] = "tutti"; $a->strings["Secret Passphrase"] = "Chiave segreta"; $a->strings["Passphrase hint"] = "Suggerimento per la chiave segreta"; $a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Nota: i permessi sono stati modificati ma non ancora salvati."; +$a->strings["close all"] = "chiudi tutto"; $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; $a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; $a->strings["ago"] = "fa"; @@ -647,12 +652,9 @@ $a->strings["Help and documentation"] = "Guida e documentazione"; $a->strings["Apps"] = "Apps"; $a->strings["Addon applications, utilities, games"] = "App, strumenti e giochi aggiuntivi"; $a->strings["Search site content"] = "Cerca nel sito"; -$a->strings["Directory"] = "Tutti i canali"; $a->strings["Channel Locator"] = "Ricerca canali"; -$a->strings["Matrix"] = "La tua rete"; $a->strings["Your matrix"] = "La tua rete"; $a->strings["Mark all matrix notifications seen"] = "Segna come lette le notifiche della tua rete"; -$a->strings["Channel Home"] = "Bacheca del canale"; $a->strings["Channel home"] = "Bacheca del canale"; $a->strings["Mark all channel notifications seen"] = "Segna come lette le notifiche dei canali"; $a->strings["Connections"] = "Contatti"; @@ -741,7 +743,13 @@ $a->strings["It's complicated"] = "Relazione complicata"; $a->strings["Don't care"] = "Chi se ne frega"; $a->strings["Ask me"] = "Chiedimelo"; $a->strings["Edit File properties"] = "Modifica le proprietà dei file"; +$a->strings["Invalid data packet"] = "Dati non validi"; +$a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale"; +$a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s"; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "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."; +$a->strings["App Category"] = "Categorie App"; +$a->strings["System"] = "Sistema"; +$a->strings["Featured"] = "In evidenza"; $a->strings["Ignore/Hide"] = "Ignora/nascondi"; $a->strings["Suggestions"] = "Suggerimenti"; $a->strings["See more..."] = "Altro..."; @@ -970,8 +978,6 @@ $a->strings["Please login to continue."] = "Accedi al sito per continuare."; $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"; $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."; $a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."; -$a->strings["No installed applications."] = "Nessuna app installata."; -$a->strings["Applications"] = "Applicazioni"; $a->strings["Item not available."] = "Elemento non disponibile."; $a->strings["Fetching URL returns error: %1\$s"] = "La chiamata all'URL restituisce questo errore: %1\$s"; $a->strings["Invalid item."] = "Elemento non valido."; @@ -1005,8 +1011,6 @@ $a->strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo $a->strings["Profile Name is required."] = "Il nome del profilo è obbligatorio ."; $a->strings["Marital Status"] = "Stato sentimentale"; $a->strings["Romantic Partner"] = "Partner affettivo"; -$a->strings["Likes"] = "Mi piace"; -$a->strings["Dislikes"] = "Non mi piace"; $a->strings["Work/Employment"] = "Lavoro/impiego"; $a->strings["Religion"] = "Religione"; $a->strings["Political Views"] = "Orientamento politico"; @@ -1081,6 +1085,7 @@ $a->strings["Description"] = "Descrizione"; $a->strings["Or enter new bookmark folder name"] = "O inserisci il nome di una nuova cartella di segnalibri"; $a->strings["Room not found"] = "Chat non trovata"; $a->strings["Leave Room"] = "Lascia la chat"; +$a->strings["Delete This Room"] = "Elimina questa chat"; $a->strings["I am away right now"] = "Non sono presente al momento"; $a->strings["I am online"] = "Sono online"; $a->strings["Bookmark this room"] = "Aggiungi chat ai segnalibri"; @@ -1429,11 +1434,11 @@ $a->strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 è scrivibile"; $a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red usa un archivio per salvare i file caricati. Il server deve avere i diritti di scrittura sulla cartella dell'archivio che si trova dentro la cartella principale di Red"; $a->strings["store is writable"] = "l'archivio è scrivibile"; $a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito."; -$a->strings["If you use https access, you MUST use a certification instance known by all internet browsers. You MUST NOT use self-signed certificates!"] = "Se abiliti https, DEVI usare un certificato riconosciuto da tutti i browser internet. NON DEVI usare certificati self-signed!"; -$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub. If your"] = "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server, per esempio."; -$a->strings["certificate is not known by the internet browser of users they get a warning message complaining about some security issues. Although"] = "Se il tuo certificato non è riconosciuto dai browser, chi ti legge riceverà degli avvisi di sicurezza."; -$a->strings["these complains are not the real truth - there are no security issues with your encryption! - the users may be confused, nerved or even"] = "Anche se questi avvisi non indicano problemi reali - la tua crittografia non ha veramente problemi di sicurezza! - gli utenti potrebbero restarne confusi o preoccupati."; -$a->strings["worse may become scared about redmatrix having security issues. Use one of the free certification instances!"] = "Oppure potrebbero anche pensare che sia redmatrix in generale ad avere problemi di sicurezza. Puoi usare un certificato gratuito!"; +$a->strings["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!"] = "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!"; +$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server."; +$a->strings["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."] = "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."; +$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Ciò può creare gravi problemi di usabilità (non solo sul tuo sito), quindi dobbiamo insistere su questo punto."; +$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Eventualmente, considera che esistono provider che rilasciano certificati gratuiti riconosciuti dai browser."; $a->strings["SSL certificate validation"] = "Validazione del certificato SSL"; $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "In .htaccess la funzionalità url rewrite non funziona. Controlla la configurazione del server."; $a->strings["Url rewrite is working"] = "Url rewrite funziona correttamente"; @@ -1778,7 +1783,7 @@ $a->strings["Set the background image"] = "Immagine di sfondo"; $a->strings["Set the background colour of items"] = "Colore di sfondo degli elementi della pagina"; $a->strings["Set the background colour of comments"] = "Imposta il colore di sfondo dei commenti"; $a->strings["Set the border colour of comments"] = "Imposta il colore del bordo dei commenti"; -$a->strings["Set the opacity of items"] = "Opacità degli oggetti"; +$a->strings["Set the indent for comments"] = "Imposta il lo spostamento a destra dei commenti"; $a->strings["Set the basic colour for item icons"] = "Colore di base per le icone"; $a->strings["Set the hover colour for item icons"] = "Colore per le icone in evidenza"; $a->strings["Set font-size for the entire application"] = "Dimensione font per tutto il sito"; -- cgit v1.2.3 From eab440d321f3895c7972010f2f9bd07e63f1d8ba Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sat, 17 May 2014 18:57:56 +0000 Subject: Dark schema: Minor minor edit --- view/theme/redbasic/schema/dark.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 4da020116..4bf22db78 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -71,13 +71,13 @@ if (! $code_bgcolour) $code_bgcolour = "#000"; if (! $code_txtcolour) - $code_txtcolour = "#bbb"; + $code_txtcolour = "#fff"; if (! $pre_borderc) $pre_borderc = "#090909"; if (! $pre_bgcolour) $pre_bgcolour = "#000"; if (! $pre_txtcolour) - $pre_txtcolour = "#bbb"; + $pre_txtcolour = "#fff"; if (! $item_bordercolour) $item_bordercolour = "#333"; if (! $notif_itemcolour) -- cgit v1.2.3 From 28e8a1d2d3d8929a0318ea9b6ae65437b6e3c41b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 17 May 2014 17:18:56 -0700 Subject: app DB structure --- boot.php | 14 +++++++------- install/database.sql | 22 ++++++++++++++++++++++ install/update.php | 27 ++++++++++++++++++++++++++- version.inc | 2 +- 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index 602012c85..f9f8ad43f 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1107 ); +define ( 'DB_UPDATE_VERSION', 1108 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -397,12 +397,11 @@ define ( 'XCHAN_FLAGS_DELETED', 0x1000); * Traficlights for Administration of HubLoc * to detect problems in inter server communication */ -define ('HUBLOC_NOTUSED', 0x0000); -define ('HUBLOC_SEND_ERROR', 0x0001); -define ('HUBLOC_RECEIVE_ERROR', 0x0002); -define ('HUBLOC_WORKS', 0x0004); -define ('HUBLOC_OFFLINE', 0x0008); - +define ('HUBLOC_NOTUSED', 0x0000); +define ('HUBLOC_SEND_ERROR', 0x0001); +define ('HUBLOC_RECEIVE_ERROR', 0x0002); +define ('HUBLOC_WORKS', 0x0004); +define ('HUBLOC_OFFLINE', 0x0008); /** * Tag/term types @@ -424,6 +423,7 @@ define ( 'TERM_OBJ_PROFILE', 3 ); define ( 'TERM_OBJ_CHANNEL', 4 ); define ( 'TERM_OBJ_OBJECT', 5 ); define ( 'TERM_OBJ_THING', 6 ); +define ( 'TERM_OBJ_APP', 7 ); /** diff --git a/install/database.sql b/install/database.sql index a5094b8e1..31fa68e9d 100644 --- a/install/database.sql +++ b/install/database.sql @@ -82,6 +82,28 @@ CREATE TABLE IF NOT EXISTS `addon` ( KEY `installed` (`installed`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `app` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `app_id` char(64) NOT NULL DEFAULT '', + `app_sig` char(255) NOT NULL DEFAULT '', + `app_author` char(255) NOT NULL DEFAULT '', + `app_name` char(255) NOT NULL DEFAULT '', + `app_desc` text NOT NULL, + `app_url` char(255) NOT NULL DEFAULT '', + `app_photo` char(255) NOT NULL DEFAULT '', + `app_version` char(255) NOT NULL DEFAULT '', + `app_channel` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `app_id` (`app_id`), + KEY `app_name` (`app_name`), + KEY `app_url` (`app_url`), + KEY `app_photo` (`app_photo`), + KEY `app_version` (`app_version`), + KEY `app_channel` (`app_channel`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + CREATE TABLE IF NOT EXISTS `attach` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', diff --git a/install/update.php b/install/update.php index d497cda70..92a4d6ef2 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sun, 18 May 2014 09:14:21 +0200 Subject: implement modal for more then 10 likes/dislikes --- boot.php | 2 +- include/ItemObject.php | 18 ++++++++++++++++++ view/tpl/conv_item.tpl | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index f9f8ad43f..e86e3da84 100755 --- a/boot.php +++ b/boot.php @@ -347,7 +347,7 @@ define ( 'DROPITEM_PHASE2', 2); * Maximum number of "people who like (or don't like) this" that we will list by name */ -define ( 'MAX_LIKERS', 75); +define ( 'MAX_LIKERS', 10); /** * Communication timeout diff --git a/include/ItemObject.php b/include/ItemObject.php index 475642787..cdb09ecf1 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -125,11 +125,24 @@ class Item extends BaseObject { $like_count = ((x($alike,$item['mid'])) ? $alike[$item['mid']] : ''); $like_list = ((x($alike,$item['mid'])) ? $alike[$item['mid'] . '-l'] : ''); + if (count($like_list) > MAX_LIKERS) { + $like_list_part = array_slice($like_list, 0, MAX_LIKERS); + array_push($like_list_part, '' . t('View all') . ''); + } else { + $like_list_part = ''; + } $like_button_label = ((x($alike,$item['mid'])) && ($alike[$item['mid']] < 2 ) ? t('Like') : t('Likes')); + if (feature_enabled($conv->get_profile_owner(),'dislike')) { $dislike_count = ((x($dlike,$item['mid'])) ? $dlike[$item['mid']] : ''); $dislike_list = ((x($dlike,$item['mid'])) ? $dlike[$item['mid'] . '-l'] : ''); $dislike_button_label = ((x($dlike,$item['mid'])) && ($dlike[$item['mid']] < 2) ? t('Dislike') : t('Dislikes')); + if (count($dislike_list) > MAX_LIKERS) { + $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); + array_push($dislike_list_part, '' . t('View all') . ''); + } else { + $dislike_list_part = ''; + } } $showlike = ((x($alike,$item['mid'])) ? format_like($alike[$item['mid']],$alike[$item['mid'] . '-l'],'like',$item['mid']) : ''); @@ -261,10 +274,15 @@ class Item extends BaseObject { // end toolbar buttons 'like_count' => $like_count, 'like_list' => $like_list, + 'like_list_part' => $like_list_part, 'like_button_label' => $like_button_label, + 'like_modal_title' => t('Likes'), + 'dislike_modal_title' => t('Dislikes'), 'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''), 'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''), + 'dislike_list_part' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''), 'dislike_button_label' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''), + 'modal_dismiss' => t('Close'), 'showlike' => $showlike, 'showdislike' => $showdislike, 'comment' => $this->get_comment_box($indent), diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index f9be3b077..ee10b6633 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -103,16 +103,60 @@ {{if $item.like_count}}
+ {{if $item.like_list_part}} + + {{else}} + {{/if}}
{{/if}} {{if $item.dislike_count}}
+ {{if $item.dislike_list_part}} + + {{else}} + {{/if}}
{{/if}} + {{if $item.like_list_part}} + + {{/if}} + {{if $item.dislike_list_part}} + + {{/if}} {{* we dont' use this do we? {{if $item.drop.pagedrop}} -- cgit v1.2.3 From 070e7cc376ec6465d61a63aa4954969cf9cb9e6e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 May 2014 00:44:42 -0700 Subject: more app infrastructure --- include/apps.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- version.inc | 2 +- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/include/apps.php b/include/apps.php index 181079f2f..58af045f1 100644 --- a/include/apps.php +++ b/include/apps.php @@ -104,12 +104,57 @@ function parse_app_description($f) { function translate_system_apps(&$arr) { - $apps = array( 'Matrix' => t('Matrix'), 'Channel Home' => t('Channel Home'), 'Profile' => t('Profile'), - 'Photos' => t('Photos'), 'Events' => t('Events'), 'Directory' => t('Directory'), 'Help' => t('Help') - + $apps = array( 'Matrix' => t('Matrix'), + 'Channel Home' => t('Channel Home'), + 'Profile' => t('Profile'), + 'Photos' => t('Photos'), + 'Events' => t('Events'), + 'Directory' => t('Directory'), + 'Help' => t('Help') ); if(array_key_exists($arr['name'],$apps)) $arr['name'] = $apps[$arr['name']]; -} \ No newline at end of file +} + +function app_render($app) { + + + + + +} + + +function app_install($uid,$app) { + + + +} + + +function app_installed($uid,$app) { + + $r = q("select id from app where app_id = '%s' and app_version = '%s' and app_channel = %d limit 1", + dbesc((array_key_exists('guid',$app)) ? $app['guid'] : ''), + dbesc((array_key_exists('version',$app)) ? $app['version'] : ''), + intval($uid) + ); + return(($r) ? true : false); + +} + + +function app_list($uid) { + $r = q("select * from app where app_channel = %d order by app_name asc", + intval($uid) + ); + return($r); +} + + +function app_decode($s) { + $x = base64_decode($s); + return json_decode($x,true); +} diff --git a/version.inc b/version.inc index 3f746cef1..934b9cd3c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-05-17.678 +2014-05-18.679 -- cgit v1.2.3 From 2b44af445515a5e1beea14d3d47025a411d39e7b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 May 2014 02:00:06 -0700 Subject: more app work --- include/apps.php | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/apps.php b/include/apps.php index 58af045f1..09aee0389 100644 --- a/include/apps.php +++ b/include/apps.php @@ -158,3 +158,47 @@ function app_decode($s) { $x = base64_decode($s); return json_decode($x,true); } + + +function app_store($arr) { + + $darray = array(); + $ret = array('success' => false); + + $darray['app_url'] = ((x($arr,'url')) ? $arr['url'] : ''); + $darray['app_channel'] = ((x($arr,'uid')) ? $arr['uid'] : 0); + if((! $darray['url']) || (! $darray['app_channel'])) + return $ret; + + $darray['app_id'] = ((x($arr,'guid')) ? $arr['guid'] : random_string()); + $darray['app_sig'] = ((x($arr,'sig')) ? $arr['sig'] : ''); + $darray['app_author'] = ((x($arr,'author')) ? $arr['author'] : get_observer_hash()); + $darray['app_name'] = ((x($arr,'name')) ? escape_tags($arr['name']) : t('Unknown')); + $darray['app_desc'] = ((x($arr,'desc')) ? escape_tags($arr['desc']) : ''); + $darray['app_photo'] = ((x($arr,'photo')) ? $arr['photo'] : z_root() . '/' . get_default_profile_photo(80)); + $darray['app_version'] = ((x($arr,'version')) ? escape_tags($arr['version']) : ''); + + $r = q("insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )", + dbesc($darray['app_id']), + dbesc($darray['app_sig']), + dbesc($darray['app_author']), + dbesc($darray['app_name']), + dbesc($darray['app_desc']), + dbesc($darray['app_url']), + dbesc($darray['app_photo']), + dbesc($darray['app_version']), + intval($darray['app_channel']) + ); + if($r) + $ret['success'] = true; + + return $ret; +} + + +function app_update($arr) { + + + + +} \ No newline at end of file -- cgit v1.2.3 From 68ca4ef19e0617904d8557e95ec74d09af833d00 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 May 2014 02:21:06 -0700 Subject: support commerical apps --- boot.php | 2 +- install/database.sql | 6 +++++- install/update.php | 13 ++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index e86e3da84..24f7d5532 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1108 ); +define ( 'DB_UPDATE_VERSION', 1109 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 31fa68e9d..0de5879a2 100644 --- a/install/database.sql +++ b/install/database.sql @@ -94,13 +94,17 @@ CREATE TABLE IF NOT EXISTS `app` ( `app_photo` char(255) NOT NULL DEFAULT '', `app_version` char(255) NOT NULL DEFAULT '', `app_channel` int(11) NOT NULL DEFAULT '0', + `app_addr` char(255) NOT NULL DEFAULT '', + `app_price` char(255) NOT NULL DEFAULT '', + `app_page` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `app_id` (`app_id`), KEY `app_name` (`app_name`), KEY `app_url` (`app_url`), KEY `app_photo` (`app_photo`), KEY `app_version` (`app_version`), - KEY `app_channel` (`app_channel`) + KEY `app_channel` (`app_channel`), + KEY `app_price` (`app_price`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index 92a4d6ef2..561070ba4 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@