aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css14
-rw-r--r--view/css/mod_directory.css3
-rw-r--r--view/es/hmessages.po735
-rw-r--r--view/es/hstrings.php181
-rw-r--r--view/it/hmessages.po1087
-rw-r--r--view/it/hstrings.php193
-rw-r--r--view/js/main.js3
-rw-r--r--view/nl/hmessages.po669
-rw-r--r--view/nl/hstrings.php115
-rw-r--r--view/theme/redbasic/css/style.css35
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl4
-rwxr-xr-xview/tpl/conv_item.tpl46
-rwxr-xr-xview/tpl/conv_list.tpl46
-rwxr-xr-xview/tpl/photo_view.tpl10
14 files changed, 1588 insertions, 1553 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index e409cf4cf..9b659ea9f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -83,15 +83,6 @@ code {
margin-right: 10px;
}
-.wall-item-photo-wrapper {
- margin-top: 0px;
- margin-bottom: 20px;
-}
-
-.comment .wall-item-photo-wrapper {
- margin-bottom: 15px;
-}
-
.wall-item-wrapper {
margin-left:10px;
}
@@ -171,11 +162,6 @@ a.wall-item-name-link {
margin-top: 10px;
}
-.wall-item-tools {
- width: 100%;
- margin-top: 10px;
-}
-
.item-tool {
cursor: pointer;
}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 8e55ac3be..5a2b8d443 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -29,3 +29,6 @@
margin-top: -2px;
}
+.directory-collapse {
+ overflow: auto;
+}
diff --git a/view/es/hmessages.po b/view/es/hmessages.po
index 0d3996b68..e65337cb1 100644
--- a/view/es/hmessages.po
+++ b/view/es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-02 00:03-0700\n"
-"PO-Revision-Date: 2015-10-04 08:23+0000\n"
+"POT-Creation-Date: 2015-10-09 00:03-0700\n"
+"PO-Revision-Date: 2015-10-12 20:30+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
"Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -213,11 +213,11 @@ msgstr "Se puede charlar conmigo (cuando esté disponible)"
#: ../../include/permissions.php:41
msgid "Can write to my file storage and photos"
-msgstr "Pueden escribirse mis ficheros compartidos y fotos"
+msgstr "Puede escribirse en mi repositorio de ficheros y fotos"
#: ../../include/permissions.php:42
msgid "Can edit my webpages"
-msgstr "Puede editar mis páginas web"
+msgstr "Pueden editarse mis páginas web"
#: ../../include/permissions.php:44
msgid "Can source my public posts in derived channels"
@@ -326,14 +326,13 @@ msgstr "Sala no encontrada."
#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/events.php:256
#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
-#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/mail.php:114 ../../mod/message.php:16 ../../mod/webpages.php:69
#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
-#: ../../mod/regmod.php:17 ../../mod/mail.php:114 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/regmod.php:17 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
@@ -780,16 +779,16 @@ msgstr "Describir (opcional)"
#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99
#: ../../mod/pdledit.php:58 ../../mod/photos.php:598 ../../mod/photos.php:969
#: ../../mod/photos.php:1009 ../../mod/photos.php:1127
-#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/mail.php:380 ../../mod/import.php:511
-#: ../../mod/thing.php:313 ../../mod/thing.php:359 ../../mod/invite.php:142
-#: ../../mod/settings.php:583 ../../mod/settings.php:695
-#: ../../mod/settings.php:723 ../../mod/settings.php:746
-#: ../../mod/settings.php:831 ../../mod/settings.php:1020
-#: ../../mod/xchan.php:11 ../../mod/group.php:81 ../../mod/connect.php:93
-#: ../../mod/locs.php:108 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/profiles.php:667 ../../mod/import_items.php:122
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/mail.php:359
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:511 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/settings.php:695 ../../mod/settings.php:723
+#: ../../mod/settings.php:746 ../../mod/settings.php:831
+#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/locs.php:108 ../../mod/setup.php:331
+#: ../../mod/setup.php:371 ../../mod/profiles.php:667
+#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Enviar"
@@ -1187,7 +1186,7 @@ msgstr "canal"
#: ../../mod/like.php:361 ../../mod/subthread.php:72
#: ../../mod/subthread.php:172
msgid "status"
-msgstr "estado"
+msgstr "el mensaje de estado"
#: ../../include/conversation.php:150 ../../include/text.php:1840
#: ../../mod/tagger.php:53
@@ -1212,7 +1211,7 @@ msgstr "%1$s ahora está conectado/a con %2$s"
#: ../../include/conversation.php:239
#, php-format
msgid "%1$s poked %2$s"
-msgstr "%1$s dio un toque a %2$s"
+msgstr "%1$s ha dado un toque a %2$s"
#: ../../include/conversation.php:243 ../../include/text.php:933
msgid "poked"
@@ -1252,12 +1251,12 @@ msgstr "Abstención"
#: ../../include/conversation.php:576 ../../mod/photos.php:1026
msgctxt "title"
msgid "Attending"
-msgstr "Participar"
+msgstr "Participando"
#: ../../include/conversation.php:576 ../../mod/photos.php:1026
msgctxt "title"
msgid "Not attending"
-msgstr "No participar"
+msgstr "No participando"
#: ../../include/conversation.php:576 ../../mod/photos.php:1026
msgctxt "title"
@@ -1314,9 +1313,8 @@ msgstr "Mostrar en su contexto"
#: ../../include/conversation.php:739 ../../include/conversation.php:1212
#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:249
-#: ../../mod/mail.php:381 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:150 ../../mod/photos.php:990
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
msgid "Please wait"
msgstr "Espere por favor"
@@ -1342,7 +1340,7 @@ msgstr "Seguir el hilo"
#: ../../include/conversation.php:943
msgid "View Status"
-msgstr "Ver el mensaje de estado"
+msgstr "Estado actual"
#: ../../include/conversation.php:944 ../../include/nav.php:86
#: ../../mod/connedit.php:494
@@ -1367,7 +1365,7 @@ msgstr "Enviar un mensaje privado"
#: ../../include/conversation.php:950 ../../include/apps.php:145
msgid "Poke"
-msgstr "Dar un toque"
+msgstr "Toque"
#: ../../include/conversation.php:1064
#, php-format
@@ -1419,7 +1417,7 @@ msgid "Visible to <strong>everybody</strong>"
msgstr "Visible para <strong>cualquiera</strong>"
#: ../../include/conversation.php:1144 ../../mod/mail.php:182
-#: ../../mod/mail.php:311
+#: ../../mod/mail.php:296
msgid "Please enter a link URL:"
msgstr "Por favor, introduzca la dirección del enlace:"
@@ -1444,7 +1442,7 @@ msgid "Where are you right now?"
msgstr "¿Donde está ahora?"
#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:183 ../../mod/mail.php:312
+#: ../../mod/mail.php:183 ../../mod/mail.php:297
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Caduca YYYY-MM-DD HH:MM"
@@ -1501,8 +1499,8 @@ msgid "Code"
msgstr "Código"
#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:246 ../../mod/mail.php:377
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
+#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr "Subir foto"
@@ -1511,7 +1509,7 @@ msgid "upload photo"
msgstr "subir foto"
#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:247 ../../mod/mail.php:378
+#: ../../mod/editblock.php:143 ../../mod/mail.php:228 ../../mod/mail.php:357
#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
msgid "Attach file"
msgstr "Adjuntar fichero"
@@ -1521,7 +1519,7 @@ msgid "attach file"
msgstr "adjuntar fichero"
#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:248 ../../mod/mail.php:379
+#: ../../mod/editblock.php:144 ../../mod/mail.php:229 ../../mod/mail.php:358
#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
msgid "Insert web link"
msgstr "Insertar enlace web"
@@ -1604,13 +1602,13 @@ msgid "Example: bob@example.com, mary@example.com"
msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:253 ../../mod/mail.php:384
+#: ../../mod/editblock.php:176 ../../mod/mail.php:233 ../../mod/mail.php:362
#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
msgid "Set expiration date"
msgstr "Configurar fecha de caducidad"
#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:255 ../../mod/mail.php:386
+#: ../../mod/editpost.php:158 ../../mod/mail.php:235 ../../mod/mail.php:364
msgid "Encrypt text"
msgstr "Cifrar texto"
@@ -1761,15 +1759,15 @@ msgstr[1] "No me gusta"
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
-msgstr[0] "Asistir"
-msgstr[1] "Participar"
+msgstr[0] "Participando"
+msgstr[1] "Participando"
#: ../../include/conversation.php:1712
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
-msgstr[0] "No asistir"
-msgstr[1] "No participar"
+msgstr[0] "No participando"
+msgstr[1] "No participando"
#: ../../include/conversation.php:1715
msgctxt "noun"
@@ -1824,206 +1822,27 @@ msgstr "La foto no ha podido ser guardada."
msgid "Upload New Photos"
msgstr "Subir nuevas fotos"
-#: ../../include/enotify.php:57 ../../include/network.php:1613
+#: ../../include/network.php:635
+msgid "view full size"
+msgstr "Ver en el tamaño original"
+
+#: ../../include/network.php:1613 ../../include/enotify.php:57
msgid "$Projectname Notification"
msgstr "Notificación de $Projectname"
-#: ../../include/enotify.php:58 ../../include/network.php:1614
+#: ../../include/network.php:1614 ../../include/enotify.php:58
msgid "$projectname"
msgstr "$projectname"
-#: ../../include/enotify.php:60 ../../include/network.php:1616
+#: ../../include/network.php:1616 ../../include/enotify.php:60
msgid "Thank You,"
msgstr "Gracias,"
-#: ../../include/enotify.php:62 ../../include/network.php:1618
+#: ../../include/network.php:1618 ../../include/enotify.php:62
#, php-format
msgid "%s Administrator"
msgstr "%s Administrador"
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Hubzilla:Aviso] Nuevo correo recibido en %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s le envió %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "un mensaje privado"
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
-
-#: ../../include/enotify.php:158
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s comentó en [zrl=%3$s]%4$s[/zrl]"
-
-#: ../../include/enotify.php:166
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s comentó en [zrl=%3$s]%4$s de %5$s[/zrl]"
-
-#: ../../include/enotify.php:175
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s comentó en [zrl=%3$s]su %4$s[/zrl]"
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s en la conversación #%1$d"
-
-#: ../../include/enotify.php:187
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s comentó un elemento/conversación que ha estado siguiendo."
-
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Para ver o comentar la conversación, visite %s"
-
-#: ../../include/enotify.php:196
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Aviso] %s escribió en su página del perfil"
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s publicó en su página del perfil en %3$s"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s publicó en [zrl=%3$s]su página del perfil[/zrl]"
-
-#: ../../include/enotify.php:224
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Hubzilla:Aviso] %s le etiquetó"
-
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s le etiquetó en %3$s"
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
-
-#: ../../include/enotify.php:238
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
-
-#: ../../include/enotify.php:239
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s le dio un toque en %3$s"
-
-#: ../../include/enotify.php:240
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]le dio un toque[/zrl]."
-
-#: ../../include/enotify.php:256
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Hubzilla:Aviso] %s etiquetó su entrada"
-
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s etiquetó su publicación en %3$s"
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s etiquetó [zrl=%3$s]su publicación[/zrl]"
-
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Hubzilla:Aviso] Solicitud de conexión recibida"
-
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en %3$s"
-
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
-
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Puede visitar su perfil en %s"
-
-#: ../../include/enotify.php:278
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
-
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Hubzilla:Aviso] recibió una sugerencia de conexión"
-
-#: ../../include/enotify.php:286
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
-
-#: ../../include/enotify.php:287
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
-
-#: ../../include/enotify.php:293
-msgid "Name:"
-msgstr "Nombre:"
-
-#: ../../include/enotify.php:294
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:297
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
-
-#: ../../include/enotify.php:511
-msgid "[Red:Notify]"
-msgstr "[Hubzilla:Aviso]"
-
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "Ver en el tamaño original"
-
#: ../../include/network.php:1660 ../../include/account.php:316
#: ../../include/account.php:343 ../../include/account.php:403
msgid "Administrator"
@@ -2092,11 +1911,11 @@ msgstr "Guardar"
#: ../../include/text.php:933
msgid "poke"
-msgstr "dar un toque"
+msgstr "un toque"
#: ../../include/text.php:934
msgid "ping"
-msgstr "avisar"
+msgstr "un ping"
#: ../../include/text.php:934
msgid "pinged"
@@ -2104,35 +1923,35 @@ msgstr "avisado/a"
#: ../../include/text.php:935
msgid "prod"
-msgstr "incitar"
+msgstr "una incitación"
#: ../../include/text.php:935
msgid "prodded"
-msgstr "incitado/a"
+msgstr "ha recibido una incitación"
#: ../../include/text.php:936
msgid "slap"
-msgstr "abofetear"
+msgstr "una bofetada"
#: ../../include/text.php:936
msgid "slapped"
-msgstr "abofeteado/a"
+msgstr "ha recibido una bofetada"
#: ../../include/text.php:937
msgid "finger"
-msgstr "señalar"
+msgstr "finger"
#: ../../include/text.php:937
msgid "fingered"
-msgstr "señalado/a"
+msgstr "ha recibido un \"finger\""
#: ../../include/text.php:938
msgid "rebuff"
-msgstr "desairar"
+msgstr "rechazo"
#: ../../include/text.php:938
msgid "rebuffed"
-msgstr "desairado/a"
+msgstr "ha sido rechazado/a"
#: ../../include/text.php:948
msgid "happy"
@@ -2486,7 +2305,7 @@ msgstr "No especificado"
#: ../../include/profile_selectors.php:6
msgid "Undecided"
-msgstr "Indeciso"
+msgstr "Indeciso/a"
#: ../../include/profile_selectors.php:42
#: ../../include/profile_selectors.php:61
@@ -2921,6 +2740,185 @@ msgstr "Conexión: %s"
msgid "Connection not found."
msgstr "Conexión no encontrada"
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Aviso] Nuevo mensaje en %s"
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s le envió %2$s."
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr "un mensaje privado"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
+
+#: ../../include/enotify.php:158
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
+
+#: ../../include/enotify.php:166
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
+
+#: ../../include/enotify.php:175
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]su %4$s[/zrl]"
+
+#: ../../include/enotify.php:186
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s a la conversación #%1$d"
+
+#: ../../include/enotify.php:187
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
+
+#: ../../include/enotify.php:190 ../../include/enotify.php:205
+#: ../../include/enotify.php:231 ../../include/enotify.php:249
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Para ver o comentar la conversación, visite %s"
+
+#: ../../include/enotify.php:196
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil"
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s publicó en su página del perfil en %3$s"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s publicó en [zrl=%3$s]su página del perfil[/zrl]"
+
+#: ../../include/enotify.php:224
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
+
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s le etiquetó en %3$s"
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
+
+#: ../../include/enotify.php:238
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
+
+#: ../../include/enotify.php:239
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s le dio un toque en %3$s"
+
+#: ../../include/enotify.php:240
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]le dio un toque[/zrl]."
+
+#: ../../include/enotify.php:256
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Aviso] %s ha etiquetado su publicación"
+
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s etiquetó su publicación en %3$s"
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s etiquetó [zrl=%3$s]su publicación[/zrl]"
+
+#: ../../include/enotify.php:270
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Aviso] Ha recibido una solicitud de conexión"
+
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en %3$s"
+
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
+
+#: ../../include/enotify.php:276 ../../include/enotify.php:295
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Puede visitar su perfil en %s"
+
+#: ../../include/enotify.php:278
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
+
+#: ../../include/enotify.php:285
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad"
+
+#: ../../include/enotify.php:286
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
+
+#: ../../include/enotify.php:287
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
+
+#: ../../include/enotify.php:293
+msgid "Name:"
+msgstr "Nombre:"
+
+#: ../../include/enotify.php:294
+msgid "Photo:"
+msgstr "Foto:"
+
+#: ../../include/enotify.php:297
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
+
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Aviso]"
+
#: ../../include/bb2diaspora.php:373
msgid "Attachments:"
msgstr "Ficheros adjuntos:"
@@ -3778,153 +3776,149 @@ msgid "Private Mail Menu"
msgstr "Menú de correo privado"
#: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Comprobar correo"
-
-#: ../../include/widgets.php:575
msgid "Combined View"
msgstr "Vista combinada"
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
msgid "Inbox"
msgstr "Bandeja de entrada"
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
msgid "Outbox"
msgstr "Bandeja de salida"
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
msgid "New Message"
msgstr "Nuevo mensaje"
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
msgid "Conversations"
msgstr "Conversaciones"
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
msgid "Received Messages"
msgstr "Mensajes recibidos"
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
msgid "Sent Messages"
msgstr "Enviar mensajes"
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
msgid "No messages."
msgstr "Sin mensajes."
-#: ../../include/widgets.php:649
+#: ../../include/widgets.php:643
msgid "Delete conversation"
msgstr "Eliminar conversación"
-#: ../../include/widgets.php:651
+#: ../../include/widgets.php:645
msgid "D, d M Y - g:i A"
msgstr "D d M Y - G:i"
-#: ../../include/widgets.php:740
+#: ../../include/widgets.php:734
msgid "Chat Rooms"
msgstr "Salas de chat"
-#: ../../include/widgets.php:760
+#: ../../include/widgets.php:754
msgid "Bookmarked Chatrooms"
msgstr "Salas de chat preferidas"
-#: ../../include/widgets.php:780
+#: ../../include/widgets.php:774
msgid "Suggested Chatrooms"
msgstr "Salas de chat sugeridas"
-#: ../../include/widgets.php:907 ../../include/widgets.php:965
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
msgid "photo/image"
msgstr "foto/imagen"
-#: ../../include/widgets.php:1060 ../../include/widgets.php:1062
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
msgid "Rate Me"
msgstr "Valorar este canal"
-#: ../../include/widgets.php:1066
+#: ../../include/widgets.php:1060
msgid "View Ratings"
msgstr "Mostrar las valoraciones"
-#: ../../include/widgets.php:1077
+#: ../../include/widgets.php:1071
msgid "Public Hubs"
msgstr "Servidores públicos"
-#: ../../include/widgets.php:1125
+#: ../../include/widgets.php:1119
msgid "Forums"
msgstr "Foros"
-#: ../../include/widgets.php:1152
+#: ../../include/widgets.php:1146
msgid "Tasks"
msgstr "Tareas"
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1155
msgid "Documentation"
msgstr "Documentación"
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1157
msgid "Project/Site Information"
msgstr "Información sobre el proyecto o sitio"
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1158
msgid "For Members"
msgstr "Para los usuarios"
-#: ../../include/widgets.php:1165
+#: ../../include/widgets.php:1159
msgid "For Administrators"
msgstr "Para los administradores"
-#: ../../include/widgets.php:1166
+#: ../../include/widgets.php:1160
msgid "For Developers"
msgstr "Para los desarrolladores"
-#: ../../include/widgets.php:1191 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
msgid "Site"
msgstr "Sitio"
-#: ../../include/widgets.php:1192
+#: ../../include/widgets.php:1186
msgid "Accounts"
msgstr "Cuentas"
-#: ../../include/widgets.php:1193 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
msgid "Channels"
msgstr "Canales"
-#: ../../include/widgets.php:1194 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
#: ../../mod/admin.php:1071
msgid "Plugins"
msgstr "Extensiones"
-#: ../../include/widgets.php:1195 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
#: ../../mod/admin.php:1265
msgid "Themes"
msgstr "Temas"
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1190
msgid "Inspect queue"
msgstr "Examinar la cola"
-#: ../../include/widgets.php:1197
+#: ../../include/widgets.php:1191
msgid "Profile Config"
msgstr "Ajustes del perfil"
-#: ../../include/widgets.php:1198
+#: ../../include/widgets.php:1192
msgid "DB updates"
msgstr "Actualizaciones de la base de datos"
-#: ../../include/widgets.php:1216 ../../include/widgets.php:1222
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
#: ../../mod/admin.php:1350
msgid "Logs"
msgstr "Informes"
-#: ../../include/widgets.php:1220 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
msgid "Admin"
msgstr "Administrador"
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1215
msgid "Plugin Features"
msgstr "Ajustes de la extensión"
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1217
msgid "User registrations waiting for confirmation"
msgstr "Registros de usuarios pendientes de confirmación"
@@ -4408,17 +4402,17 @@ msgstr "%1$s se abstiene en %3$s de %2$s"
#: ../../mod/like.php:420
#, php-format
msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s participará en el %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s participa"
#: ../../mod/like.php:422
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s no participará en el %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s no participa"
#: ../../mod/like.php:424
#, php-format
msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s tal vez participe en el %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s quizá participe"
#: ../../mod/like.php:520
msgid "Action completed."
@@ -4513,7 +4507,7 @@ msgstr "Ninguna conexión en común."
#: ../../mod/ping.php:260
msgid "sent you a private message"
-msgstr "enviarle un mensaje privado"
+msgstr "le ha enviado un mensaje privado"
#: ../../mod/ping.php:308
msgid "added your channel"
@@ -4896,7 +4890,7 @@ msgstr "palabras, una por línea, o #etiquetas o /patrones/, dejar en blanco par
#: ../../mod/connedit.php:673
msgid "Do not import posts with this text"
-msgstr "No importar entradas que contienen este texto"
+msgstr "No importar entradas que contengan este texto"
#: ../../mod/connedit.php:675
msgid "This information is public!"
@@ -5107,7 +5101,7 @@ msgstr "Descargar el fichero PDL"
#: ../../mod/poke.php:164
msgid "Poke/Prod"
-msgstr "Dar un toque/Incitar"
+msgstr "Toque/Incitación"
#: ../../mod/poke.php:165
msgid "poke, prod or do other things to somebody"
@@ -5309,7 +5303,7 @@ msgstr "correo recuperado"
#: ../../mod/dreport.php:106
msgid "duplicate mail received"
-msgstr "se ha recibido correo duplicado"
+msgstr "se ha recibido mensaje duplicado"
#: ../../mod/dreport.php:109
msgid "mail delivered"
@@ -6842,6 +6836,93 @@ msgstr "Sitio web:"
msgid "Description: "
msgstr "Descripción:"
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Imposible asociar a un destinatario."
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Imposible comunicar con el canal solicitado."
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "No se puede verificar el canal solicitado."
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
+
+#: ../../mod/mail.php:128
+msgid "Messages"
+msgstr "Mensajes"
+
+#: ../../mod/mail.php:155
+msgid "Message recalled."
+msgstr "Mensaje recuperado."
+
+#: ../../mod/mail.php:168
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: ../../mod/mail.php:211
+msgid "Requested channel is not in this network"
+msgstr "El canal solicitado no existe en esta red"
+
+#: ../../mod/mail.php:219
+msgid "Send Private Message"
+msgstr "Enviar un mensaje privado"
+
+#: ../../mod/mail.php:220 ../../mod/mail.php:349
+msgid "To:"
+msgstr "Para:"
+
+#: ../../mod/mail.php:223 ../../mod/mail.php:351
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../../mod/mail.php:226 ../../mod/invite.php:131
+msgid "Your message:"
+msgstr "Su mensaje:"
+
+#: ../../mod/mail.php:230
+msgid "Send"
+msgstr "Enviar"
+
+#: ../../mod/mail.php:321
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: ../../mod/mail.php:322
+msgid "Delivery report"
+msgstr "Informe de transmisión"
+
+#: ../../mod/mail.php:323
+msgid "Recall message"
+msgstr "Recuperar el mensaje"
+
+#: ../../mod/mail.php:325
+msgid "Message has been recalled."
+msgstr "El mensaje ha sido recuperado."
+
+#: ../../mod/mail.php:342
+msgid "Delete Conversation"
+msgstr "Eliminar Conversación"
+
+#: ../../mod/mail.php:344
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
+
+#: ../../mod/mail.php:348
+msgid "Send Reply"
+msgstr "Responder"
+
+#: ../../mod/mail.php:353
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Su mensaje para %s (%s):"
+
#: ../../mod/webpages.php:191
msgid "Page Title"
msgstr "Título de página"
@@ -7077,84 +7158,6 @@ msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
msgid "Authenticate"
msgstr "Acceder"
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Imposible asociar a un destinatario."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Imposible comunicar con el canal solicitado."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "No se puede verificar el canal solicitado."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Mensajes"
-
-#: ../../mod/mail.php:155
-msgid "Message recalled."
-msgstr "Mensaje recuperado."
-
-#: ../../mod/mail.php:168
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: ../../mod/mail.php:233
-msgid "Send Private Message"
-msgstr "Enviar un mensaje privado"
-
-#: ../../mod/mail.php:234 ../../mod/mail.php:368
-msgid "To:"
-msgstr "Para:"
-
-#: ../../mod/mail.php:239 ../../mod/mail.php:370
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: ../../mod/mail.php:243 ../../mod/mail.php:373 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Su mensaje:"
-
-#: ../../mod/mail.php:250
-msgid "Send"
-msgstr "Enviar"
-
-#: ../../mod/mail.php:336
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: ../../mod/mail.php:337
-msgid "Delivery report"
-msgstr "Informe de transmisión"
-
-#: ../../mod/mail.php:338
-msgid "Recall message"
-msgstr "Recuperar el mensaje"
-
-#: ../../mod/mail.php:340
-msgid "Message has been recalled."
-msgstr "El mensaje ha sido recuperado."
-
-#: ../../mod/mail.php:361
-msgid "Delete Conversation"
-msgstr "Eliminar Conversación"
-
-#: ../../mod/mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
-
-#: ../../mod/mail.php:367
-msgid "Send Reply"
-msgstr "Responder"
-
#: ../../mod/siteinfo.php:111
#, php-format
msgid "Version %s"
@@ -7376,7 +7379,7 @@ msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administ
#: ../../mod/invite.php:92
#, php-format
msgid "%s : Message delivery failed."
-msgstr "%s : Falló la entrega del mensaje."
+msgstr "%s : Falló el envío del mensaje."
#: ../../mod/invite.php:96
#, php-format
@@ -7884,7 +7887,7 @@ msgstr "Usted sea etiquetado en una publicación"
#: ../../mod/settings.php:1079
msgid "You are poked/prodded/etc. in a post"
-msgstr "Recibir un toque o incitación en una publicación"
+msgstr "Reciba un toque o incitación en una entrada"
#: ../../mod/settings.php:1082
msgid "Show visual notifications including:"
@@ -9009,7 +9012,7 @@ msgstr "Importación completada"
#: ../../mod/import_items.php:119
msgid "Import Items"
-msgstr "Importar Artículos"
+msgstr "Importar elementos"
#: ../../mod/import_items.php:120
msgid ""
diff --git a/view/es/hstrings.php b/view/es/hstrings.php
index 838f50fd4..afa899fb9 100644
--- a/view/es/hstrings.php
+++ b/view/es/hstrings.php
@@ -45,8 +45,8 @@ $a->strings["Profiles and things other than posts/comments"] = "Perfiles y otras
$a->strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
$a->strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
$a->strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
-$a->strings["Can write to my file storage and photos"] = "Pueden escribirse mis ficheros compartidos y fotos";
-$a->strings["Can edit my webpages"] = "Puede editar mis páginas web";
+$a->strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
+$a->strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
$a->strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos en canales derivados";
$a->strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
$a->strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
@@ -262,12 +262,12 @@ $a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podid
$a->strings["photo"] = "foto";
$a->strings["event"] = "evento";
$a->strings["channel"] = "canal";
-$a->strings["status"] = "estado";
+$a->strings["status"] = "el mensaje de estado";
$a->strings["comment"] = "comentario";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta el %3\$s de %2\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta el %3\$s de %2\$s";
$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s dio un toque a %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
$a->strings["poked"] = "ha recibido un toque";
$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
$a->strings["__ctx:title__ Likes"] = "Me gusta";
@@ -275,8 +275,8 @@ $a->strings["__ctx:title__ Dislikes"] = "No me gusta";
$a->strings["__ctx:title__ Agree"] = "De acuerdo";
$a->strings["__ctx:title__ Disagree"] = "En desacuerdo";
$a->strings["__ctx:title__ Abstain"] = "Abstención";
-$a->strings["__ctx:title__ Attending"] = "Participar";
-$a->strings["__ctx:title__ Not attending"] = "No participar";
+$a->strings["__ctx:title__ Attending"] = "Participando";
+$a->strings["__ctx:title__ Not attending"] = "No participando";
$a->strings["__ctx:title__ Might attend"] = "Quizá participe";
$a->strings["Select"] = "Seleccionar";
$a->strings["Private Message"] = "Mensaje Privado";
@@ -295,13 +295,13 @@ $a->strings["Loading..."] = "Cargando...";
$a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
$a->strings["View Source"] = "Ver la fuente original de la entrada";
$a->strings["Follow Thread"] = "Seguir el hilo";
-$a->strings["View Status"] = "Ver el mensaje de estado";
+$a->strings["View Status"] = "Estado actual";
$a->strings["View Profile"] = "Ver el perfil";
$a->strings["View Photos"] = "Ver fotos";
$a->strings["Activity/Posts"] = "Actividad y entradas";
$a->strings["Edit Connection"] = "Editar conexión";
$a->strings["Send PM"] = "Enviar un mensaje privado";
-$a->strings["Poke"] = "Dar un toque";
+$a->strings["Poke"] = "Toque";
$a->strings["%s likes this."] = "a %s le gusta esto.";
$a->strings["%s doesn't like this."] = "a %s no le gusta esto.";
$a->strings["<span %1\$s>%2\$d people</span> like this."] = array(
@@ -397,12 +397,12 @@ $a->strings["__ctx:noun__ Dislike"] = array(
1 => "No me gusta",
);
$a->strings["__ctx:noun__ Attending"] = array(
- 0 => "Asistir",
- 1 => "Participar",
+ 0 => "Participando",
+ 1 => "Participando",
);
$a->strings["__ctx:noun__ Not Attending"] = array(
- 0 => "No asistir",
- 1 => "No participar",
+ 0 => "No participando",
+ 1 => "No participando",
);
$a->strings["__ctx:noun__ Undecided"] = array(
0 => "Indeciso/a",
@@ -426,47 +426,11 @@ $a->strings["Image file is empty."] = "El fichero de imagen está vacío. ";
$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen";
$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
$a->strings["Upload New Photos"] = "Subir nuevas fotos";
+$a->strings["view full size"] = "Ver en el tamaño original";
$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
$a->strings["\$projectname"] = "\$projectname";
$a->strings["Thank You,"] = "Gracias,";
$a->strings["%s Administrator"] = "%s Administrador";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo correo recibido en %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
-$a->strings["a private message"] = "un mensaje privado";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]%4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]%4\$s de %5\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]su %4\$s[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s comentó un elemento/conversación que ha estado siguiendo.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s escribió en su página del perfil";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s publicó en su página del perfil en %3\$s";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s publicó en [zrl=%3\$s]su página del perfil[/zrl]";
-$a->strings["[Red:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le etiquetó";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s etiquetó su entrada";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s etiquetó su publicación en %3\$s";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetó [zrl=%3\$s]su publicación[/zrl]";
-$a->strings["[Red:Notify] Introduction received"] = "[Hubzilla:Aviso] Solicitud de conexión recibida";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] recibió una sugerencia de conexión";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
-$a->strings["Name:"] = "Nombre:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
-$a->strings["[Red:Notify]"] = "[Hubzilla:Aviso]";
-$a->strings["view full size"] = "Ver en el tamaño original";
$a->strings["Administrator"] = "Administrador";
$a->strings["No Subject"] = "Sin asunto";
$a->strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
@@ -484,17 +448,17 @@ $a->strings["%d Connection"] = array(
$a->strings["View Connections"] = "Ver conexiones";
$a->strings["Search"] = "Buscar";
$a->strings["Save"] = "Guardar";
-$a->strings["poke"] = "dar un toque";
-$a->strings["ping"] = "avisar";
+$a->strings["poke"] = "un toque";
+$a->strings["ping"] = "un ping";
$a->strings["pinged"] = "avisado/a";
-$a->strings["prod"] = "incitar";
-$a->strings["prodded"] = "incitado/a";
-$a->strings["slap"] = "abofetear";
-$a->strings["slapped"] = "abofeteado/a";
-$a->strings["finger"] = "señalar";
-$a->strings["fingered"] = "señalado/a";
-$a->strings["rebuff"] = "desairar";
-$a->strings["rebuffed"] = "desairado/a";
+$a->strings["prod"] = "una incitación";
+$a->strings["prodded"] = "ha recibido una incitación";
+$a->strings["slap"] = "una bofetada";
+$a->strings["slapped"] = "ha recibido una bofetada";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "ha recibido un \"finger\"";
+$a->strings["rebuff"] = "rechazo";
+$a->strings["rebuffed"] = "ha sido rechazado/a";
$a->strings["happy"] = "feliz";
$a->strings["sad"] = "triste";
$a->strings["mellow"] = "amable";
@@ -579,7 +543,7 @@ $a->strings["Transsexual"] = "Transexual";
$a->strings["Hermaphrodite"] = "Hermafrodita";
$a->strings["Neuter"] = "Neutral";
$a->strings["Non-specific"] = "No especificado";
-$a->strings["Undecided"] = "Indeciso";
+$a->strings["Undecided"] = "Indeciso/a";
$a->strings["Males"] = "Hombres";
$a->strings["Females"] = "Mujeres";
$a->strings["Gay"] = "Homosexual";
@@ -680,6 +644,42 @@ $a->strings["Collection is empty."] = "La colección está vacía.";
$a->strings["Collection: %s"] = "Colección: %s";
$a->strings["Connection: %s"] = "Conexión: %s";
$a->strings["Connection not found."] = "Conexión no encontrada";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
+$a->strings["a private message"] = "un mensaje privado";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]su %4\$s[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s publicó en su página del perfil en %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s publicó en [zrl=%3\$s]su página del perfil[/zrl]";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s etiquetó su publicación en %3\$s";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetó [zrl=%3\$s]su publicación[/zrl]";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
+$a->strings["Name:"] = "Nombre:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
$a->strings["Attachments:"] = "Ficheros adjuntos:";
$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
$a->strings["Image/photo"] = "Imagen/foto";
@@ -890,7 +890,6 @@ $a->strings["Export channel"] = "Exportar canal";
$a->strings["Connection Default Permissions"] = "Permisos predeterminados de conexión";
$a->strings["Premium Channel Settings"] = "Configuración del canal premium";
$a->strings["Private Mail Menu"] = "Menú de correo privado";
-$a->strings["Check Mail"] = "Comprobar correo";
$a->strings["Combined View"] = "Vista combinada";
$a->strings["Inbox"] = "Bandeja de entrada";
$a->strings["Outbox"] = "Bandeja de salida";
@@ -1042,9 +1041,9 @@ $a->strings["Previous action reversed."] = "Acción anterior revocada.";
$a->strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s está de acuerdo con %3\$s de %2\$s";
$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s no está de acuerdo con %3\$s de %2\$s";
$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s se abstiene en %3\$s de %2\$s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s participará en el %3\$s de %2\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no participará en el %3\$s de %2\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s tal vez participe en el %3\$s de %2\$s";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s participa";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s no participa";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe";
$a->strings["Action completed."] = "Acción completada.";
$a->strings["Thank you."] = "Gracias.";
$a->strings["Export Channel"] = "Exportar el canal";
@@ -1062,7 +1061,7 @@ $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado el %
$a->strings["No channel."] = "Ningún canal.";
$a->strings["Common connections"] = "Conexiones comunes";
$a->strings["No connections in common."] = "Ninguna conexión en común.";
-$a->strings["sent you a private message"] = "enviarle un mensaje privado";
+$a->strings["sent you a private message"] = "le ha enviado un mensaje privado";
$a->strings["added your channel"] = "añadió este canal a sus conexiones";
$a->strings["posted an event"] = "publicó un evento";
$a->strings["Documentation Search"] = "Búsqueda de Documentación";
@@ -1155,7 +1154,7 @@ $a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar s
$a->strings["Custom Filter"] = "Filtro personalizado";
$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "palabras, una por línea, o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas";
-$a->strings["Do not import posts with this text"] = "No importar entradas que contienen este texto";
+$a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
$a->strings["This information is public!"] = "¡Esta información es pública!";
$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
$a->strings["Connection Request"] = "Solicitud de conexión";
@@ -1202,7 +1201,7 @@ $a->strings["Layout Description (Optional)"] = "Descripción del formato gráfic
$a->strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
$a->strings["Layout Description"] = "Descripción del formato";
$a->strings["Download PDL file"] = "Descargar el fichero PDL";
-$a->strings["Poke/Prod"] = "Dar un toque/Incitar";
+$a->strings["Poke/Prod"] = "Toque/Incitación";
$a->strings["poke, prod or do other things to somebody"] = "dar un toque, incitar u otras cosas a alguien";
$a->strings["Recipient"] = "Destinatario";
$a->strings["Choose what you wish to do to recipient"] = "Elegir qué desea enviar al destinatario";
@@ -1250,7 +1249,7 @@ $a->strings["update ignored"] = "actualización ignorada";
$a->strings["permission denied"] = "permiso denegado";
$a->strings["recipient not found"] = "destinatario no encontrado";
$a->strings["mail recalled"] = "correo recuperado";
-$a->strings["duplicate mail received"] = "se ha recibido correo duplicado";
+$a->strings["duplicate mail received"] = "se ha recibido mensaje duplicado";
$a->strings["mail delivered"] = "correo enviado";
$a->strings["Delete block?"] = "¿Borrar bloque?";
$a->strings["Edit Block"] = "Modificar este bloque";
@@ -1619,6 +1618,27 @@ $a->strings["Ratings"] = "Valoraciones";
$a->strings["Rating: "] = "Valoración:";
$a->strings["Website: "] = "Sitio web:";
$a->strings["Description: "] = "Descripción:";
+$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
+$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
+$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Message recalled."] = "Mensaje recuperado.";
+$a->strings["Conversation removed."] = "Conversación eliminada.";
+$a->strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
+$a->strings["Send Private Message"] = "Enviar un mensaje privado";
+$a->strings["To:"] = "Para:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["Your message:"] = "Su mensaje:";
+$a->strings["Send"] = "Enviar";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["Delivery report"] = "Informe de transmisión";
+$a->strings["Recall message"] = "Recuperar el mensaje";
+$a->strings["Message has been recalled."] = "El mensaje ha sido recuperado.";
+$a->strings["Delete Conversation"] = "Eliminar Conversación";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
+$a->strings["Send Reply"] = "Responder";
+$a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
$a->strings["Page Title"] = "Título de página";
$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
@@ -1673,25 +1693,6 @@ $a->strings["Authentication failed."] = "Falló la autenticación.";
$a->strings["Remote Authentication"] = "Acceso desde su servidor";
$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)";
$a->strings["Authenticate"] = "Acceder";
-$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
-$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
-$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Message recalled."] = "Mensaje recuperado.";
-$a->strings["Conversation removed."] = "Conversación eliminada.";
-$a->strings["Send Private Message"] = "Enviar un mensaje privado";
-$a->strings["To:"] = "Para:";
-$a->strings["Subject:"] = "Asunto:";
-$a->strings["Your message:"] = "Su mensaje:";
-$a->strings["Send"] = "Enviar";
-$a->strings["Delete message"] = "Borrar mensaje";
-$a->strings["Delivery report"] = "Informe de transmisión";
-$a->strings["Recall message"] = "Recuperar el mensaje";
-$a->strings["Message has been recalled."] = "El mensaje ha sido recuperado.";
-$a->strings["Delete Conversation"] = "Eliminar Conversación";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
-$a->strings["Send Reply"] = "Responder";
$a->strings["Version %s"] = "Versión %s";
$a->strings["Installed plugins/addons/apps:"] = "Extensiones/Aplicaciones instaladas:";
$a->strings["No installed plugins/addons/apps"] = "Extensiones/Aplicaciones no instaladas:";
@@ -1741,7 +1742,7 @@ $a->strings["Total invitation limit exceeded."] = "Se ha superado el límite má
$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
$a->strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
-$a->strings["%s : Message delivery failed."] = "%s : Falló la entrega del mensaje.";
+$a->strings["%s : Message delivery failed."] = "%s : Falló el envío del mensaje.";
$a->strings["%d message sent."] = array(
0 => "%d mensajes enviados.",
1 => "%d mensajes enviados.",
@@ -1867,7 +1868,7 @@ $a->strings["Someone writes a followup comment"] = "Alguien escriba un comentari
$a->strings["You receive a private message"] = "Reciba un mensaje privado";
$a->strings["You receive a friend suggestion"] = "Reciba una sugerencia de amistad";
$a->strings["You are tagged in a post"] = "Usted sea etiquetado en una publicación";
-$a->strings["You are poked/prodded/etc. in a post"] = "Recibir un toque o incitación en una publicación";
+$a->strings["You are poked/prodded/etc. in a post"] = "Reciba un toque o incitación en una entrada";
$a->strings["Show visual notifications including:"] = "Mostrar notificaciones visuales que incluyan:";
$a->strings["Unseen matrix activity"] = "Actividad no vista en la red";
$a->strings["Unseen channel activity"] = "Actividad no vista en el canal";
@@ -2124,7 +2125,7 @@ $a->strings["Save Bookmark"] = "Guardar marcador";
$a->strings["URL of bookmark"] = "Dirección del marcador";
$a->strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nombre para la carpeta de marcadores";
$a->strings["Import completed"] = "Importación completada";
-$a->strings["Import Items"] = "Importar Artículos";
+$a->strings["Import Items"] = "Importar elementos";
$a->strings["Use this form to import existing posts and content from an export file."] = "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación.";
$a->strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
$a->strings["Theme settings"] = "Ajustes del tema";
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index 6f37f3518..61041e863 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-0700\n"
-"PO-Revision-Date: 2015-10-01 15:20+0000\n"
+"POT-Creation-Date: 2015-10-09 00:03-0700\n"
+"PO-Revision-Date: 2015-10-10 11:09+0000\n"
"Last-Translator: tuscanhobbit <pynolo@tarine.net>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -304,7 +304,7 @@ msgstr "Chat non trovata."
#: ../../include/attach.php:348 ../../include/attach.php:355
#: ../../include/attach.php:433 ../../include/attach.php:840
#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
+#: ../../include/items.php:4348 ../../mod/achievements.php:30
#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
@@ -313,23 +313,22 @@ msgstr "Chat non trovata."
#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
+#: ../../mod/chat.php:96 ../../mod/rate.php:111 ../../mod/channel.php:100
+#: ../../mod/channel.php:214 ../../mod/channel.php:254
#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../mod/appman.php:66
+#: ../../mod/item.php:214 ../../mod/item.php:1003 ../../mod/appman.php:66
#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
-#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/events.php:256
+#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
+#: ../../mod/mail.php:114 ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
+#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
+#: ../../mod/regmod.php:17 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
@@ -358,7 +357,7 @@ msgstr "AAAA-MM-GG oppure MM-GG"
msgid "Required"
msgstr "Obbligatorio"
-#: ../../include/datetime.php:262 ../../boot.php:2306
+#: ../../include/datetime.php:262 ../../boot.php:2312
msgid "never"
msgstr "mai"
@@ -759,7 +758,7 @@ msgid "Rate This Channel (this is public)"
msgstr "Valuta questo canale (visibile a tutti)"
#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
+#: ../../mod/rate.php:157
msgid "Rating"
msgstr "Valutazioni"
@@ -771,14 +770,15 @@ msgstr "Descrizione (facoltativa)"
#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/admin.php:411 ../../mod/admin.php:776
-#: ../../mod/admin.php:940 ../../mod/admin.php:1072 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1351 ../../mod/appman.php:99 ../../mod/pdledit.php:58
-#: ../../mod/photos.php:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/chat.php:209 ../../mod/rate.php:168 ../../mod/admin.php:411
+#: ../../mod/admin.php:776 ../../mod/admin.php:940 ../../mod/admin.php:1072
+#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99
+#: ../../mod/pdledit.php:58 ../../mod/photos.php:598 ../../mod/photos.php:969
+#: ../../mod/photos.php:1009 ../../mod/photos.php:1127
+#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/mail.php:359
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:511 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
#: ../../mod/settings.php:695 ../../mod/settings.php:723
#: ../../mod/settings.php:746 ../../mod/settings.php:831
#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
@@ -1086,7 +1086,7 @@ msgstr "RSS/Atom"
#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
#: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
+#: ../../boot.php:1505
msgid "Email"
msgstr "Email"
@@ -1309,9 +1309,8 @@ msgstr "Vedi nel contesto"
#: ../../include/conversation.php:739 ../../include/conversation.php:1212
#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:150 ../../mod/photos.php:990
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
msgid "Please wait"
msgstr "Attendere"
@@ -1337,7 +1336,7 @@ msgstr "Segui la discussione"
#: ../../include/conversation.php:943
msgid "View Status"
-msgstr "Guarda il messaggio di stato"
+msgstr "Stato attuale"
#: ../../include/conversation.php:944 ../../include/nav.php:86
#: ../../mod/connedit.php:494
@@ -1413,8 +1412,8 @@ msgstr "Non piace a %s."
msgid "Visible to <strong>everybody</strong>"
msgstr "Visibile a <strong>tutti</strong>"
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
+#: ../../include/conversation.php:1144 ../../mod/mail.php:182
+#: ../../mod/mail.php:296
msgid "Please enter a link URL:"
msgstr "Inserisci l'indirizzo del link:"
@@ -1439,7 +1438,7 @@ msgid "Where are you right now?"
msgstr "Dove sei ora?"
#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
+#: ../../mod/mail.php:183 ../../mod/mail.php:297
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Scade il YYYY-MM-DD HH:MM"
@@ -1496,8 +1495,8 @@ msgid "Code"
msgstr "Codice"
#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
+#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr "Carica foto"
@@ -1506,7 +1505,7 @@ msgid "upload photo"
msgstr "carica foto"
#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
+#: ../../mod/editblock.php:143 ../../mod/mail.php:228 ../../mod/mail.php:357
#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
msgid "Attach file"
msgstr "Allega file"
@@ -1516,7 +1515,7 @@ msgid "attach file"
msgstr "allega file"
#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
+#: ../../mod/editblock.php:144 ../../mod/mail.php:229 ../../mod/mail.php:358
#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
msgid "Insert web link"
msgstr "Inserisci un indirizzo web"
@@ -1599,13 +1598,13 @@ msgid "Example: bob@example.com, mary@example.com"
msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
+#: ../../mod/editblock.php:176 ../../mod/mail.php:233 ../../mod/mail.php:362
#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
msgid "Set expiration date"
msgstr "Data di scadenza"
#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
+#: ../../mod/editpost.php:158 ../../mod/mail.php:235 ../../mod/mail.php:364
msgid "Encrypt text"
msgstr "Cifratura del messaggio"
@@ -1735,8 +1734,8 @@ msgstr "Gestisci le pagine web"
msgid "View all"
msgstr "Vedi tutto"
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
+#: ../../include/conversation.php:1703 ../../include/identity.php:1252
+#: ../../include/taxonomy.php:403 ../../include/ItemObject.php:179
#: ../../mod/photos.php:1047
msgctxt "noun"
msgid "Like"
@@ -1819,208 +1818,29 @@ msgstr "Impossibile salvare la foto."
msgid "Upload New Photos"
msgstr "Carica nuove foto"
-#: ../../include/enotify.php:57 ../../include/network.php:1613
+#: ../../include/network.php:635
+msgid "view full size"
+msgstr "guarda nelle dimensioni reali"
+
+#: ../../include/network.php:1613 ../../include/enotify.php:57
msgid "$Projectname Notification"
msgstr "Notifica $Projectname"
-#: ../../include/enotify.php:58 ../../include/network.php:1614
+#: ../../include/network.php:1614 ../../include/enotify.php:58
msgid "$projectname"
msgstr "$projectname"
-#: ../../include/enotify.php:60 ../../include/network.php:1616
+#: ../../include/network.php:1616 ../../include/enotify.php:60
msgid "Thank You,"
msgstr "Grazie,"
-#: ../../include/enotify.php:62 ../../include/network.php:1618
+#: ../../include/network.php:1618 ../../include/enotify.php:62
#, php-format
msgid "%s Administrator"
msgstr "L'amministratore di %s"
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Hubzilla] Nuovo messaggio su %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s ti ha mandato un messaggio privato su %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s ti ha mandato %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "un messaggio privato"
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Visita %s per leggere i tuoi messaggi privati e rispondere."
-
-#: ../../include/enotify.php:158
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s[/zrl]"
-
-#: ../../include/enotify.php:166
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%5$s di %4$s[/zrl]"
-
-#: ../../include/enotify.php:175
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]"
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla] Nuovo commento di %2$s alla conversazione #%1$d"
-
-#: ../../include/enotify.php:187
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s ha commentato un elemento che stavi seguendo."
-
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Visita %s per leggere o commentare la conversazione."
-
-#: ../../include/enotify.php:196
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla] %s ha scritto sulla tua bacheca"
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s ha scritto sulla bacheca del tuo profilo su %3$s"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
-
-#: ../../include/enotify.php:224
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Hubzilla] %s ti ha taggato"
-
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s ti ha taggato su %3$s"
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
-
-#: ../../include/enotify.php:238
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Hubzilla] %1$s ti ha mandato un poke"
-
-#: ../../include/enotify.php:239
-#, 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"
-
-#: ../../include/enotify.php:240
-#, 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/enotify.php:256
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Hubzilla] %s ha taggato il tuo post"
-
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s ha taggato il tuo post su %3$s"
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo post[/zrl]"
-
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Hubzilla] Hai una richiesta di amicizia"
-
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, hai ricevuto una richiesta di entrare in contatto da '%2$s' su %3$s"
-
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, hai ricevuto una [zrl=%2$s]richiesta di entrare in contatto[/zrl] da %3$s."
-
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Puoi visitare il suo profilo su %s"
-
-#: ../../include/enotify.php:278
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Visita %s per approvare o rifiutare la richiesta di entrare in contatto."
-
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Hubzilla] Ti è stato suggerito un amico"
-
-#: ../../include/enotify.php:286
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, ti è stato suggerito un amico da '%2$s' su %3$s"
-
-#: ../../include/enotify.php:287
-#, php-format
-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/enotify.php:293
-msgid "Name:"
-msgstr "Nome:"
-
-#: ../../include/enotify.php:294
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:297
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Visita %s per approvare o rifiutare il suggerimento."
-
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
-msgstr "[Hubzilla]"
-
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "guarda nelle dimensioni reali"
-
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
+#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
msgid "Administrator"
msgstr "Amministratore"
@@ -2732,7 +2552,7 @@ msgstr "Amministrazione sito"
msgid "Address Book"
msgstr "Rubrica"
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
msgid "Login"
msgstr "Accedi"
@@ -2766,7 +2586,7 @@ msgstr "Eventi"
#: ../../include/apps.php:141 ../../include/nav.php:162
msgid "Directory"
-msgstr "Elenco pubblico"
+msgstr "Elenchi pubblici dei canali"
#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
#: ../../mod/help.php:207 ../../mod/layouts.php:176
@@ -2843,6 +2663,258 @@ msgstr "Autenticazione fallita"
msgid "Login failed."
msgstr "Accesso fallito."
+#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/subthread.php:49 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
+#: ../../index.php:360
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: ../../include/items.php:1128 ../../include/items.php:1174
+msgid "(Unknown)"
+msgstr "(Sconosciuto)"
+
+#: ../../include/items.php:1371
+msgid "Visible to anybody on the internet."
+msgstr "Visibile a chiunque su internet."
+
+#: ../../include/items.php:1373
+msgid "Visible to you only."
+msgstr "Visibile solo a te."
+
+#: ../../include/items.php:1375
+msgid "Visible to anybody in this network."
+msgstr "Visibile a tutti su questa rete."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody authenticated."
+msgstr "Visibile a chiunque sia autenticato."
+
+#: ../../include/items.php:1379
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visibile a tutti su %s."
+
+#: ../../include/items.php:1381
+msgid "Visible to all connections."
+msgstr "Visibile a tutti coloro che ti seguono."
+
+#: ../../include/items.php:1383
+msgid "Visible to approved connections."
+msgstr "Visibile ai contatti approvati."
+
+#: ../../include/items.php:1385
+msgid "Visible to specific connections."
+msgstr "Visibile ad alcuni contatti scelti."
+
+#: ../../include/items.php:4269 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
+#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Elemento non trovato."
+
+#: ../../include/items.php:4778 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Insieme di canali non trovato."
+
+#: ../../include/items.php:4794
+msgid "Collection is empty."
+msgstr "L'insieme di canali è vuoto."
+
+#: ../../include/items.php:4801
+#, php-format
+msgid "Collection: %s"
+msgstr "Insieme: %s"
+
+#: ../../include/items.php:4811 ../../mod/connedit.php:658
+#, php-format
+msgid "Connection: %s"
+msgstr "Contatto: %s"
+
+#: ../../include/items.php:4813
+msgid "Connection not found."
+msgstr "Contatto non trovato."
+
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla] Nuovo messaggio su %s"
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s ti ha mandato un messaggio privato su %3$s."
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s ti ha mandato %2$s."
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr "un messaggio privato"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Visita %s per leggere i tuoi messaggi privati e rispondere."
+
+#: ../../include/enotify.php:158
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s[/zrl]"
+
+#: ../../include/enotify.php:166
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%5$s di %4$s[/zrl]"
+
+#: ../../include/enotify.php:175
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]"
+
+#: ../../include/enotify.php:186
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla] Nuovo commento di %2$s alla conversazione #%1$d"
+
+#: ../../include/enotify.php:187
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s ha commentato un elemento che stavi seguendo."
+
+#: ../../include/enotify.php:190 ../../include/enotify.php:205
+#: ../../include/enotify.php:231 ../../include/enotify.php:249
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Visita %s per leggere o commentare la conversazione."
+
+#: ../../include/enotify.php:196
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla] %s ha scritto sulla tua bacheca"
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s ha scritto sulla bacheca del tuo profilo su %3$s"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
+
+#: ../../include/enotify.php:224
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla] %s ti ha taggato"
+
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s ti ha taggato su %3$s"
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
+
+#: ../../include/enotify.php:238
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla] %1$s ti ha mandato un poke"
+
+#: ../../include/enotify.php:239
+#, 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"
+
+#: ../../include/enotify.php:240
+#, 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/enotify.php:256
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla] %s ha taggato il tuo post"
+
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s ha taggato il tuo post su %3$s"
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo post[/zrl]"
+
+#: ../../include/enotify.php:270
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla] Hai una richiesta di amicizia"
+
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, hai ricevuto una richiesta di entrare in contatto da '%2$s' su %3$s"
+
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, hai ricevuto una [zrl=%2$s]richiesta di entrare in contatto[/zrl] da %3$s."
+
+#: ../../include/enotify.php:276 ../../include/enotify.php:295
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Puoi visitare il suo profilo su %s"
+
+#: ../../include/enotify.php:278
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Visita %s per approvare o rifiutare la richiesta di entrare in contatto."
+
+#: ../../include/enotify.php:285
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla] Ti è stato suggerito un amico"
+
+#: ../../include/enotify.php:286
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, ti è stato suggerito un amico da '%2$s' su %3$s"
+
+#: ../../include/enotify.php:287
+#, php-format
+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/enotify.php:293
+msgid "Name:"
+msgstr "Nome:"
+
+#: ../../include/enotify.php:294
+msgid "Photo:"
+msgstr "Foto:"
+
+#: ../../include/enotify.php:297
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Visita %s per approvare o rifiutare il suggerimento."
+
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla]"
+
#: ../../include/bb2diaspora.php:373
msgid "Attachments:"
msgstr "Allegati:"
@@ -2942,47 +3014,47 @@ msgstr "Inserisci le informazioni richieste."
msgid "Failed to store account information."
msgstr "Non è stato possibile salvare le informazioni del tuo account."
-#: ../../include/account.php:246
+#: ../../include/account.php:248
#, php-format
msgid "Registration confirmation for %s"
msgstr "Registrazione di %s confermata"
-#: ../../include/account.php:312
+#: ../../include/account.php:314
#, php-format
msgid "Registration request at %s"
msgstr "Richiesta di registrazione su %s"
-#: ../../include/account.php:336
+#: ../../include/account.php:338
msgid "your registration password"
msgstr "la password di registrazione"
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/account.php:341 ../../include/account.php:401
#, php-format
msgid "Registration details for %s"
msgstr "Dettagli della registrazione di %s"
-#: ../../include/account.php:408
+#: ../../include/account.php:410
msgid "Account approved."
msgstr "Account approvato."
-#: ../../include/account.php:447
+#: ../../include/account.php:449
#, php-format
msgid "Registration revoked for %s"
msgstr "Registrazione revocata per %s"
-#: ../../include/account.php:492
+#: ../../include/account.php:494
msgid "Account verified. Please login."
msgstr "Registrazione verificata. Adesso puoi effettuare login."
-#: ../../include/account.php:705 ../../include/account.php:707
+#: ../../include/account.php:707 ../../include/account.php:709
msgid "Click here to upgrade."
msgstr "Clicca qui per aggiornare."
-#: ../../include/account.php:713
+#: ../../include/account.php:715
msgid "This action exceeds the limits set by your subscription plan."
msgstr "Questa operazione supera i limiti del tuo abbonamento."
-#: ../../include/account.php:718
+#: ../../include/account.php:720
msgid "This action is not available under your subscription plan."
msgstr "Questa operazione non è prevista dal tuo abbonamento."
@@ -3018,7 +3090,7 @@ msgstr "l'account locale non è stato trovato."
msgid "Cannot connect to yourself."
msgstr "Non puoi connetterti a te stesso."
-#: ../../include/security.php:345
+#: ../../include/security.php:381
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."
@@ -3133,85 +3205,6 @@ msgstr "Canali che non sono in un insieme"
msgid "add"
msgstr "aggiungi"
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr "Tag"
-
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr "Parole chiave"
-
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr "ho"
-
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr "ha"
-
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr "voglio"
-
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr "vuole"
-
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr "mi piace"
-
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr "gli piace"
-
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
-msgstr "non mi piace"
-
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
-msgstr "non gli piace"
-
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr "Opzioni elenco pubblico"
-
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr "Modalità SafeSearch"
-
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
-msgstr "No"
-
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
-msgstr "Si"
-
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr "Solo forum pubblici"
-
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr "Solo in questo sito"
-
#: ../../include/identity.php:32
msgid "Unable to obtain identity information from database"
msgstr "Impossibile ottenere le informazioni di identificazione dal database"
@@ -3467,6 +3460,63 @@ msgstr "Impossibile determinare il mittente."
msgid "Stored post could not be verified."
msgstr "Non è stato possibile verificare il post."
+#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
+msgid "Tags"
+msgstr "Tag"
+
+#: ../../include/taxonomy.php:294
+msgid "Keywords"
+msgstr "Parole chiave"
+
+#: ../../include/taxonomy.php:315
+msgid "have"
+msgstr "ho"
+
+#: ../../include/taxonomy.php:315
+msgid "has"
+msgstr "ha"
+
+#: ../../include/taxonomy.php:316
+msgid "want"
+msgstr "voglio"
+
+#: ../../include/taxonomy.php:316
+msgid "wants"
+msgstr "vuole"
+
+#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
+msgid "like"
+msgstr "mi piace"
+
+#: ../../include/taxonomy.php:317
+msgid "likes"
+msgstr "gli piace"
+
+#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
+msgid "dislike"
+msgstr "non mi piace"
+
+#: ../../include/taxonomy.php:318
+msgid "dislikes"
+msgstr "non gli piace"
+
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
+msgstr "Dati ricevuti non validi"
+
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
+msgstr "Impossibile verificare la firma elettronica del canale"
+
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Impossibile verificare la firma elettronica del sito %s"
+
+#: ../../include/zot.php:3543
+msgid "invalid target signature"
+msgstr "la firma ricevuta non è valida"
+
#: ../../include/ItemObject.php:130
msgid "Save to Folder"
msgstr "Salva nella cartella"
@@ -3602,78 +3652,6 @@ msgstr "Collegamento"
msgid "Video"
msgstr "Video"
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
-msgstr "(Sconosciuto)"
-
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
-msgstr "Visibile a chiunque su internet."
-
-#: ../../include/items.php:1373
-msgid "Visible to you only."
-msgstr "Visibile solo a te."
-
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
-msgstr "Visibile a tutti su questa rete."
-
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
-msgstr "Visibile a chiunque sia autenticato."
-
-#: ../../include/items.php:1379
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visibile a tutti su %s."
-
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
-msgstr "Visibile a tutti coloro che ti seguono."
-
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
-msgstr "Visibile ai contatti approvati."
-
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
-msgstr "Visibile ad alcuni contatti scelti."
-
-#: ../../include/items.php:4263 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
-#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Elemento non trovato."
-
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Insieme di canali non trovato."
-
-#: ../../include/items.php:4788
-msgid "Collection is empty."
-msgstr "L'insieme di canali è vuoto."
-
-#: ../../include/items.php:4795
-#, php-format
-msgid "Collection: %s"
-msgstr "Insieme: %s"
-
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
-#, php-format
-msgid "Connection: %s"
-msgstr "Contatto: %s"
-
-#: ../../include/items.php:4807
-msgid "Connection not found."
-msgstr "Contatto non trovato."
-
#: ../../include/widgets.php:91 ../../include/nav.php:157
#: ../../mod/apps.php:36
msgid "Apps"
@@ -3794,174 +3772,153 @@ msgid "Private Mail Menu"
msgstr "Menu messaggi privati"
#: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Controlla i messaggi"
-
-#: ../../include/widgets.php:575
msgid "Combined View"
msgstr "Vista combinata"
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
msgid "Inbox"
msgstr "In arrivo"
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
msgid "Outbox"
msgstr "Inviati"
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
msgid "New Message"
msgstr "Nuovo messaggio"
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
msgid "Conversations"
msgstr "Conversazioni"
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
msgid "Received Messages"
msgstr "Ricevuti"
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
msgid "Sent Messages"
msgstr "Inviati"
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
msgid "No messages."
msgstr "Nessun messaggio."
-#: ../../include/widgets.php:648
+#: ../../include/widgets.php:643
msgid "Delete conversation"
msgstr "Elimina la conversazione"
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:645
msgid "D, d M Y - g:i A"
msgstr "D d M Y - G:i"
-#: ../../include/widgets.php:738
+#: ../../include/widgets.php:734
msgid "Chat Rooms"
msgstr "Chat"
-#: ../../include/widgets.php:758
+#: ../../include/widgets.php:754
msgid "Bookmarked Chatrooms"
msgstr "Chat nei segnalibri"
-#: ../../include/widgets.php:778
+#: ../../include/widgets.php:774
msgid "Suggested Chatrooms"
msgstr "Chat suggerite"
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
msgid "photo/image"
msgstr "foto/immagine"
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
msgid "Rate Me"
msgstr "Valutami"
-#: ../../include/widgets.php:1064
+#: ../../include/widgets.php:1060
msgid "View Ratings"
msgstr "Vedi le valutazioni ricevute"
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1071
msgid "Public Hubs"
msgstr "Hub pubblici"
-#: ../../include/widgets.php:1123
+#: ../../include/widgets.php:1119
msgid "Forums"
msgstr "Forum"
-#: ../../include/widgets.php:1150
+#: ../../include/widgets.php:1146
msgid "Tasks"
msgstr "Attività"
-#: ../../include/widgets.php:1159
+#: ../../include/widgets.php:1155
msgid "Documentation"
msgstr "Guida"
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1157
msgid "Project/Site Information"
msgstr "Informazioni sul sito/progetto"
-#: ../../include/widgets.php:1162
+#: ../../include/widgets.php:1158
msgid "For Members"
msgstr "Per gli utenti"
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1159
msgid "For Administrators"
msgstr "Per gli amministratori"
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1160
msgid "For Developers"
msgstr "Per sviluppatori"
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
msgid "Site"
msgstr "Sito"
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1186
msgid "Accounts"
msgstr "Account"
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
msgid "Channels"
msgstr "Canali"
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
#: ../../mod/admin.php:1071
msgid "Plugins"
msgstr "Plugin"
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
#: ../../mod/admin.php:1265
msgid "Themes"
msgstr "Temi"
-#: ../../include/widgets.php:1194
+#: ../../include/widgets.php:1190
msgid "Inspect queue"
msgstr "Coda di attesa"
-#: ../../include/widgets.php:1195
+#: ../../include/widgets.php:1191
msgid "Profile Config"
msgstr "Configurazione del profilo"
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1192
msgid "DB updates"
msgstr "Aggiornamenti al DB"
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
#: ../../mod/admin.php:1350
msgid "Logs"
msgstr "Log"
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
msgid "Admin"
msgstr "Amministrazione"
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1215
msgid "Plugin Features"
msgstr "Plugin"
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1217
msgid "User registrations waiting for confirmation"
msgstr "Registrazioni in attesa"
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr "Dati ricevuti non validi"
-
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr "Impossibile verificare la firma elettronica del canale"
-
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Impossibile verificare la firma elettronica del sito %s"
-
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr "la firma ricevuta non è valida"
-
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
msgid "Logout"
msgstr "Esci"
@@ -4034,7 +3991,7 @@ msgstr "Clicca per farti riconoscere dal tuo hub principale"
msgid "Home Page"
msgstr "Bacheca"
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
msgid "Register"
msgstr "Registrati"
@@ -4056,7 +4013,7 @@ msgstr "Cerca nel sito per @nome, #tag, ?guida o per contenuto"
#: ../../include/nav.php:162
msgid "Channel Directory"
-msgstr "Elenco pubblico canali"
+msgstr "Elenchi pubblici dei canali"
#: ../../include/nav.php:174
msgid "Grid"
@@ -4142,6 +4099,45 @@ msgstr "@nome, #tag, ?guida, contenuto"
msgid "Please wait..."
msgstr "Attendere..."
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opzioni per elenchi pubblici"
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Modalità SafeSearch"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
+#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
+#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
+#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "No"
+msgstr "No"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
+#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
+#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "Yes"
+msgstr "Si"
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Solo forum pubblici"
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Solo in questo sito"
+
#: ../../mod/achievements.php:34
msgid "Some blurb about what to do when you're new here"
msgstr "Qualche suggerimento per i nuovi utenti su cosa fare"
@@ -4210,11 +4206,11 @@ msgstr "Contatti in comune:"
#: ../../mod/directory.php:374
msgid "Global Directory"
-msgstr "Elenco globale dei canali"
+msgstr "Elenchi pubblici globali"
#: ../../mod/directory.php:374
msgid "Local Directory"
-msgstr "Elenco canali su questo server"
+msgstr "Elenco canali su questo hub"
#: ../../mod/directory.php:380
msgid "Finding:"
@@ -4561,7 +4557,7 @@ msgstr "Inserisci la tua password per verifica:"
#: ../../mod/removeme.php:60
msgid "Remove this channel and all its clones from the network"
-msgstr "Rimuovi questo canale e tutti i suoi cloni dalla rete"
+msgstr "Elimina questo canale e tutti i suoi cloni dalla rete"
#: ../../mod/removeme.php:60
msgid ""
@@ -4928,7 +4924,7 @@ msgstr "derivato"
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
-msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo dopo aver effettuato l'accesso."
+msgstr "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso."
#: ../../mod/connedit.php:691
msgid "Their Settings"
@@ -5074,6 +5070,10 @@ msgstr "Mostra l'URL del file"
msgid "Notify your contacts about this file"
msgstr "Notifica ai contatti che hai caricato questo file"
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Questo non è un directory server"
+
#: ../../mod/layouts.php:121 ../../mod/layouts.php:179
#: ../../mod/editlayout.php:161
msgid "Layout Name"
@@ -5194,9 +5194,22 @@ msgstr "Elementi taggati con: %s"
msgid "Search results for: %s"
msgstr "Risultati ricerca: %s"
-#: ../../mod/message.php:34
-msgid "Conversation removed."
-msgstr "Conversazione rimossa."
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr "Sito web:"
+
+#: ../../mod/rate.php:161
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
+
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr "Valutazione (visibile a tutti)"
+
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Commento alla valutazione (facoltativo, visibile a tutti)"
#: ../../mod/channel.php:97
msgid "Insufficient permissions. Request redirected to profile page."
@@ -5235,47 +5248,63 @@ msgstr "Inserisci audio Vorbis [.ogg]"
msgid "Edit post"
msgstr "Modifica post"
-#: ../../mod/dreport.php:15
+#: ../../mod/dreport.php:23
msgid "Invalid message"
msgstr "Messaggio non valido"
-#: ../../mod/dreport.php:25
+#: ../../mod/dreport.php:55
msgid "no results"
msgstr "nessun risultato"
-#: ../../mod/dreport.php:30
+#: ../../mod/dreport.php:60
#, php-format
msgid "Delivery report for %1$s"
msgstr "Rapporto di consegna - %1$s"
-#: ../../mod/dreport.php:39
+#: ../../mod/dreport.php:74
msgid "channel sync processed"
msgstr "sincronizzazione del canale effettuata"
-#: ../../mod/dreport.php:43
+#: ../../mod/dreport.php:78
msgid "queued"
msgstr "in coda"
-#: ../../mod/dreport.php:47
+#: ../../mod/dreport.php:82
msgid "posted"
msgstr "inviato"
-#: ../../mod/dreport.php:51
+#: ../../mod/dreport.php:86
msgid "accepted for delivery"
msgstr "accettato per la spedizione"
-#: ../../mod/dreport.php:55
+#: ../../mod/dreport.php:90
msgid "updated"
msgstr "aggiornato"
-#: ../../mod/dreport.php:58
+#: ../../mod/dreport.php:93
msgid "update ignored"
msgstr "aggiornamento ignorato"
-#: ../../mod/dreport.php:61
+#: ../../mod/dreport.php:96
msgid "permission denied"
msgstr "permessi non sufficienti"
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr "Destinatario non trovato"
+
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr "messaggio richiamato dal mittente"
+
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr "ricevuto messaggio duplicato"
+
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr "messaggio recapitato"
+
#: ../../mod/editblock.php:118
msgid "Delete block?"
msgstr "Vuoi eliminare questo riquadro?"
@@ -5297,28 +5326,28 @@ msgstr "%s ti dà il benvenuto"
msgid "Unable to locate original post."
msgstr "Impossibile trovare il messaggio originale."
-#: ../../mod/item.php:407
+#: ../../mod/item.php:418
msgid "Empty post discarded."
msgstr "Il post vuoto è stato ignorato."
-#: ../../mod/item.php:447
+#: ../../mod/item.php:458
msgid "Executable content type not permitted to this channel."
msgstr "I contenuti eseguibili non sono permessi su questo canale."
-#: ../../mod/item.php:896
+#: ../../mod/item.php:907
msgid "System error. Post not saved."
msgstr "Errore di sistema. Post non salvato."
-#: ../../mod/item.php:1163
+#: ../../mod/item.php:1174
msgid "Unable to obtain post information from database."
msgstr "Impossibile caricare il post dal database."
-#: ../../mod/item.php:1170
+#: ../../mod/item.php:1181
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
-#: ../../mod/item.php:1177
+#: ../../mod/item.php:1188
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
@@ -5608,7 +5637,7 @@ msgstr "Forza la publicazione del profilo"
#: ../../mod/admin.php:439
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Seleziona per mostrare nell'elenco pubblico <strong>tutti</strong> i profili registrati su questo sito."
+msgstr "Seleziona per mostrare negli elenchi pubblici <strong>tutti</strong> i profili registrati su questo sito."
#: ../../mod/admin.php:440
msgid "Disable discovery tab"
@@ -6333,7 +6362,7 @@ msgid ""
"Password reset failed."
msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata."
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
+#: ../../mod/lostpass.php:86 ../../boot.php:1511
msgid "Password Reset"
msgstr "Reimposta la password"
@@ -6545,23 +6574,6 @@ msgstr "Foto recenti"
msgid "$Projectname channel"
msgstr "Canale $Projectname"
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Sito web:"
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr "Valutazione (visibile a tutti)"
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Commento alla valutazione (facoltativo, visibile a tutti)"
-
#: ../../mod/events.php:21
msgid "Calendar entries imported."
msgstr "Le voci del calendario sono state importate."
@@ -6654,7 +6666,7 @@ msgstr "Adatta al fuso orario di chi legge"
msgid ""
"Important for events that happen in a particular place. Not practical for "
"global holidays."
-msgstr "Importante per eventi che avvengono online ma con l'orario di un luogo particolare."
+msgstr "Importante per eventi che avvengono online ma con un certo fuso orario."
#: ../../mod/events.php:703
msgid "Title:"
@@ -6820,10 +6832,6 @@ msgstr "Sito web:"
msgid "Description: "
msgstr "Descrizione:"
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Questo non è un server di elenchi di canali"
-
#: ../../mod/mail.php:33
msgid "Unable to lookup recipient."
msgstr "Impossibile associare un destinatario."
@@ -6844,38 +6852,46 @@ msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi priv
msgid "Messages"
msgstr "Messaggi"
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr "Messaggio eliminato."
-
-#: ../../mod/mail.php:154
+#: ../../mod/mail.php:155
msgid "Message recalled."
msgstr "Messaggio revocato."
-#: ../../mod/mail.php:221
+#: ../../mod/mail.php:168
+msgid "Conversation removed."
+msgstr "Conversazione rimossa."
+
+#: ../../mod/mail.php:211
+msgid "Requested channel is not in this network"
+msgstr "Il canale cercato non è in questa rete"
+
+#: ../../mod/mail.php:219
msgid "Send Private Message"
msgstr "Invia un messaggio privato"
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
+#: ../../mod/mail.php:220 ../../mod/mail.php:349
msgid "To:"
msgstr "A:"
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
+#: ../../mod/mail.php:223 ../../mod/mail.php:351
msgid "Subject:"
msgstr "Oggetto:"
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
+#: ../../mod/mail.php:226 ../../mod/invite.php:131
msgid "Your message:"
msgstr "Il tuo messaggio:"
-#: ../../mod/mail.php:238
+#: ../../mod/mail.php:230
msgid "Send"
msgstr "Invia"
-#: ../../mod/mail.php:322
+#: ../../mod/mail.php:321
msgid "Delete message"
msgstr "Elimina il messaggio"
+#: ../../mod/mail.php:322
+msgid "Delivery report"
+msgstr "Rapporto di trasmissione"
+
#: ../../mod/mail.php:323
msgid "Recall message"
msgstr "Revoca il messaggio"
@@ -6884,20 +6900,25 @@ msgstr "Revoca il messaggio"
msgid "Message has been recalled."
msgstr "Il messaggio è stato revocato."
-#: ../../mod/mail.php:345
+#: ../../mod/mail.php:342
msgid "Delete Conversation"
msgstr "Elimina la conversazione"
-#: ../../mod/mail.php:347
+#: ../../mod/mail.php:344
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente."
-#: ../../mod/mail.php:351
+#: ../../mod/mail.php:348
msgid "Send Reply"
msgstr "Invia la risposta"
+#: ../../mod/mail.php:353
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Il tuo messaggio per %s (%s):"
+
#: ../../mod/webpages.php:191
msgid "Page Title"
msgstr "Titolo della pagina"
@@ -7025,6 +7046,10 @@ msgstr "Non esistono restrizioni su questa classe di account."
msgid "Item not available."
msgstr "Elemento non disponibile."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr "Questo server di elenchi pubblici necessita di un token di autenticazione"
+
#: ../../mod/sources.php:32
msgid "Failed to create source. No channel selected."
msgstr "Impossibile creare la sorgente. Nessun canale selezionato."
@@ -7129,10 +7154,6 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
msgid "Authenticate"
msgstr "Accedi"
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "Questo server di elenchi pubblici necessita di un token di autenticazione"
-
#: ../../mod/siteinfo.php:111
#, php-format
msgid "Version %s"
@@ -7316,7 +7337,7 @@ msgstr "Pubblica un'attività"
#: ../../mod/thing.php:302 ../../mod/thing.php:351
msgid "Only sends to viewers of the applicable profile"
-msgstr "Invia solo a chi può vedere il profilo"
+msgstr "Invia solo a chi può vedere il profilo scelto"
#: ../../mod/thing.php:304 ../../mod/thing.php:353
msgid "Name of thing e.g. something"
@@ -7680,7 +7701,7 @@ msgstr "Chiunque su internet"
#: ../../mod/settings.php:963
msgid "Publish your default profile in the network directory"
-msgstr "Mostra il mio profilo predefinito nell'elenco pubblico dei canali"
+msgstr "Mostra il mio profilo predefinito negli elenchi pubblici dei canali"
#: ../../mod/settings.php:968
msgid "Allow us to suggest you as a potential friend to new members?"
@@ -8883,7 +8904,7 @@ msgstr "Per esempio: pesca fotografia programmazione"
#: ../../mod/profiles.php:700
msgid "Used in directory listings"
-msgstr "Visibile nell'elenco pubblico di canali"
+msgstr "Visibile sugli elenchi pubblici di canali"
#: ../../mod/profiles.php:701
msgid "Tell us about yourself..."
@@ -9130,51 +9151,51 @@ msgstr "Dimensione foto dell'autore della conversazione"
msgid "Set size of followup author photos"
msgstr "Dimensione foto dei partecipanti alla conversazione"
-#: ../../boot.php:1302
+#: ../../boot.php:1308
#, php-format
msgid "Update %s failed. See error logs."
msgstr "%s: aggiornamento fallito. Controlla i log di errore."
-#: ../../boot.php:1305
+#: ../../boot.php:1311
#, php-format
msgid "Update Error at %s"
msgstr "Errore di aggiornamento su %s"
-#: ../../boot.php:1472
+#: ../../boot.php:1478
msgid ""
"Create an account to access services and applications within the Hubzilla"
msgstr "Registrati per accedere ai servizi e alle applicazioni di Hubzilla"
-#: ../../boot.php:1500
+#: ../../boot.php:1506
msgid "Password"
msgstr "Password"
-#: ../../boot.php:1501
+#: ../../boot.php:1507
msgid "Remember me"
msgstr "Resta connesso"
-#: ../../boot.php:1504
+#: ../../boot.php:1510
msgid "Forgot your password?"
msgstr "Hai dimenticato la password?"
-#: ../../boot.php:2130
+#: ../../boot.php:2136
msgid "toggle mobile"
msgstr "attiva/disattiva versione mobile"
-#: ../../boot.php:2265
+#: ../../boot.php:2271
msgid "Website SSL certificate is not valid. Please correct."
msgstr "Il certificato SSL del sito non è valido. Si prega di intervenire."
-#: ../../boot.php:2268
+#: ../../boot.php:2274
#, php-format
msgid "[hubzilla] Website SSL error for %s"
msgstr "[hubzilla] Errore SSL su %s"
-#: ../../boot.php:2305
+#: ../../boot.php:2311
msgid "Cron/Scheduled tasks not running."
msgstr "Processi cron non avviati."
-#: ../../boot.php:2309
+#: ../../boot.php:2315
#, php-format
msgid "[hubzilla] Cron tasks not running on %s"
msgstr "[hubzilla] Cron non è stato eseguito %s"
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index 72fc2fa60..fad8b1fc1 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -295,7 +295,7 @@ $a->strings["Loading..."] = "Caricamento in corso...";
$a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
$a->strings["View Source"] = "Vedi il sorgente";
$a->strings["Follow Thread"] = "Segui la discussione";
-$a->strings["View Status"] = "Guarda il messaggio di stato";
+$a->strings["View Status"] = "Stato attuale";
$a->strings["View Profile"] = "Profilo";
$a->strings["View Photos"] = "Foto";
$a->strings["Activity/Posts"] = "Attività e Post";
@@ -426,47 +426,11 @@ $a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
$a->strings["Photo storage failed."] = "Impossibile salvare la foto.";
$a->strings["Upload New Photos"] = "Carica nuove foto";
+$a->strings["view full size"] = "guarda nelle dimensioni reali";
$a->strings["\$Projectname Notification"] = "Notifica \$Projectname";
$a->strings["\$projectname"] = "\$projectname";
$a->strings["Thank You,"] = "Grazie,";
$a->strings["%s Administrator"] = "L'amministratore di %s";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Hubzilla] Nuovo messaggio su %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s ti ha mandato un messaggio privato su %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha mandato %2\$s.";
-$a->strings["a private message"] = "un messaggio privato";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per leggere i tuoi messaggi privati e rispondere.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%5\$s di %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s che hai creato[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla] Nuovo commento di %2\$s alla conversazione #%1\$d";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha commentato un elemento che stavi seguendo.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per leggere o commentare la conversazione.";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Hubzilla] %s ha scritto sulla tua bacheca";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha scritto sulla bacheca del tuo profilo su %3\$s";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha scritto sulla [zrl=%3\$s]tua bacheca[/zrl]";
-$a->strings["[Red:Notify] %s tagged you"] = "[Hubzilla] %s ti ha taggato";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s ti ha taggato su %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]ti ha taggato[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Hubzilla] %1\$s ti ha mandato un poke";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s ti ha mandato un poke su %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]ti ha mandato un poke[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Hubzilla] %s ha taggato il tuo post";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha taggato il tuo post su %3\$s";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha taggato [zrl=%3\$s]il tuo post[/zrl]";
-$a->strings["[Red:Notify] Introduction received"] = "[Hubzilla] Hai una richiesta di amicizia";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, hai ricevuto una richiesta di entrare in contatto da '%2\$s' su %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, hai ricevuto una [zrl=%2\$s]richiesta di entrare in contatto[/zrl] da %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo su %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Visita %s per approvare o rifiutare la richiesta di entrare in contatto.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Hubzilla] Ti è stato suggerito un amico";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ti è stato suggerito un amico da '%2\$s' su %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, %4\$s ti [zrl=%2\$s]ha suggerito %3\$s[/zrl] come amico.";
-$a->strings["Name:"] = "Nome:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
-$a->strings["[Red:Notify]"] = "[Hubzilla]";
-$a->strings["view full size"] = "guarda nelle dimensioni reali";
$a->strings["Administrator"] = "Amministratore";
$a->strings["No Subject"] = "Nessun titolo";
$a->strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s";
@@ -645,7 +609,7 @@ $a->strings["Settings"] = "Impostazioni";
$a->strings["Channel Home"] = "Bacheca del canale";
$a->strings["Profile"] = "Profilo";
$a->strings["Events"] = "Eventi";
-$a->strings["Directory"] = "Elenco pubblico";
+$a->strings["Directory"] = "Elenchi pubblici dei canali";
$a->strings["Help"] = "Guida";
$a->strings["Mail"] = "Messaggi";
$a->strings["Mood"] = "Umore";
@@ -664,6 +628,58 @@ $a->strings["Purchase"] = "Acquista";
$a->strings["Logged out."] = "Uscita effettuata.";
$a->strings["Failed authentication"] = "Autenticazione fallita";
$a->strings["Login failed."] = "Accesso fallito.";
+$a->strings["Permission denied"] = "Permesso negato";
+$a->strings["(Unknown)"] = "(Sconosciuto)";
+$a->strings["Visible to anybody on the internet."] = "Visibile a chiunque su internet.";
+$a->strings["Visible to you only."] = "Visibile solo a te.";
+$a->strings["Visible to anybody in this network."] = "Visibile a tutti su questa rete.";
+$a->strings["Visible to anybody authenticated."] = "Visibile a chiunque sia autenticato.";
+$a->strings["Visible to anybody on %s."] = "Visibile a tutti su %s.";
+$a->strings["Visible to all connections."] = "Visibile a tutti coloro che ti seguono.";
+$a->strings["Visible to approved connections."] = "Visibile ai contatti approvati.";
+$a->strings["Visible to specific connections."] = "Visibile ad alcuni contatti scelti.";
+$a->strings["Item not found."] = "Elemento non trovato.";
+$a->strings["Collection not found."] = "Insieme di canali non trovato.";
+$a->strings["Collection is empty."] = "L'insieme di canali è vuoto.";
+$a->strings["Collection: %s"] = "Insieme: %s";
+$a->strings["Connection: %s"] = "Contatto: %s";
+$a->strings["Connection not found."] = "Contatto non trovato.";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla] Nuovo messaggio su %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s ti ha mandato un messaggio privato su %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha mandato %2\$s.";
+$a->strings["a private message"] = "un messaggio privato";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per leggere i tuoi messaggi privati e rispondere.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%5\$s di %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s che hai creato[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla] Nuovo commento di %2\$s alla conversazione #%1\$d";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha commentato un elemento che stavi seguendo.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per leggere o commentare la conversazione.";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla] %s ha scritto sulla tua bacheca";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha scritto sulla bacheca del tuo profilo su %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha scritto sulla [zrl=%3\$s]tua bacheca[/zrl]";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla] %s ti ha taggato";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s ti ha taggato su %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]ti ha taggato[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla] %1\$s ti ha mandato un poke";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s ti ha mandato un poke su %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]ti ha mandato un poke[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla] %s ha taggato il tuo post";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha taggato il tuo post su %3\$s";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha taggato [zrl=%3\$s]il tuo post[/zrl]";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla] Hai una richiesta di amicizia";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, hai ricevuto una richiesta di entrare in contatto da '%2\$s' su %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, hai ricevuto una [zrl=%2\$s]richiesta di entrare in contatto[/zrl] da %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo su %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Visita %s per approvare o rifiutare la richiesta di entrare in contatto.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla] Ti è stato suggerito un amico";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ti è stato suggerito un amico da '%2\$s' su %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, %4\$s ti [zrl=%2\$s]ha suggerito %3\$s[/zrl] come amico.";
+$a->strings["Name:"] = "Nome:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla]";
$a->strings["Attachments:"] = "Allegati:";
$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
$a->strings["Image/photo"] = "Immagine";
@@ -735,22 +751,6 @@ $a->strings["Edit collection"] = "Modifica l'insieme di canali";
$a->strings["Add new collection"] = "Nuovo insieme";
$a->strings["Channels not in any collection"] = "Canali che non sono in un insieme";
$a->strings["add"] = "aggiungi";
-$a->strings["Tags"] = "Tag";
-$a->strings["Keywords"] = "Parole chiave";
-$a->strings["have"] = "ho";
-$a->strings["has"] = "ha";
-$a->strings["want"] = "voglio";
-$a->strings["wants"] = "vuole";
-$a->strings["like"] = "mi piace";
-$a->strings["likes"] = "gli piace";
-$a->strings["dislike"] = "non mi piace";
-$a->strings["dislikes"] = "non gli piace";
-$a->strings["Directory Options"] = "Opzioni elenco pubblico";
-$a->strings["Safe Mode"] = "Modalità SafeSearch";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Si";
-$a->strings["Public Forums Only"] = "Solo forum pubblici";
-$a->strings["This Website Only"] = "Solo in questo sito";
$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
$a->strings["Empty name"] = "Nome vuoto";
$a->strings["Name too long"] = "Nome troppo lungo";
@@ -812,6 +812,20 @@ $a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
$a->strings["[no subject]"] = "[nessun titolo]";
$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
+$a->strings["Tags"] = "Tag";
+$a->strings["Keywords"] = "Parole chiave";
+$a->strings["have"] = "ho";
+$a->strings["has"] = "ha";
+$a->strings["want"] = "voglio";
+$a->strings["wants"] = "vuole";
+$a->strings["like"] = "mi piace";
+$a->strings["likes"] = "gli piace";
+$a->strings["dislike"] = "non mi piace";
+$a->strings["dislikes"] = "non gli piace";
+$a->strings["Invalid data packet"] = "Dati ricevuti 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["invalid target signature"] = "la firma ricevuta non è valida";
$a->strings["Save to Folder"] = "Salva nella cartella";
$a->strings["I will attend"] = "Parteciperò";
$a->strings["I will not attend"] = "Non parteciperò";
@@ -847,22 +861,6 @@ $a->strings["This is you"] = "Questo sei tu";
$a->strings["Image"] = "Immagine";
$a->strings["Insert Link"] = "Collegamento";
$a->strings["Video"] = "Video";
-$a->strings["Permission denied"] = "Permesso negato";
-$a->strings["(Unknown)"] = "(Sconosciuto)";
-$a->strings["Visible to anybody on the internet."] = "Visibile a chiunque su internet.";
-$a->strings["Visible to you only."] = "Visibile solo a te.";
-$a->strings["Visible to anybody in this network."] = "Visibile a tutti su questa rete.";
-$a->strings["Visible to anybody authenticated."] = "Visibile a chiunque sia autenticato.";
-$a->strings["Visible to anybody on %s."] = "Visibile a tutti su %s.";
-$a->strings["Visible to all connections."] = "Visibile a tutti coloro che ti seguono.";
-$a->strings["Visible to approved connections."] = "Visibile ai contatti approvati.";
-$a->strings["Visible to specific connections."] = "Visibile ad alcuni contatti scelti.";
-$a->strings["Item not found."] = "Elemento non trovato.";
-$a->strings["Collection not found."] = "Insieme di canali non trovato.";
-$a->strings["Collection is empty."] = "L'insieme di canali è vuoto.";
-$a->strings["Collection: %s"] = "Insieme: %s";
-$a->strings["Connection: %s"] = "Contatto: %s";
-$a->strings["Connection not found."] = "Contatto non trovato.";
$a->strings["Apps"] = "App";
$a->strings["System"] = "Sistema";
$a->strings["Create Personal App"] = "Crea app personale";
@@ -892,7 +890,6 @@ $a->strings["Export channel"] = "Esporta il canale";
$a->strings["Connection Default Permissions"] = "Permessi predefiniti dei nuovi contatti";
$a->strings["Premium Channel Settings"] = "Canale premium - impostazioni";
$a->strings["Private Mail Menu"] = "Menu messaggi privati";
-$a->strings["Check Mail"] = "Controlla i messaggi";
$a->strings["Combined View"] = "Vista combinata";
$a->strings["Inbox"] = "In arrivo";
$a->strings["Outbox"] = "Inviati";
@@ -929,10 +926,6 @@ $a->strings["Logs"] = "Log";
$a->strings["Admin"] = "Amministrazione";
$a->strings["Plugin Features"] = "Plugin";
$a->strings["User registrations waiting for confirmation"] = "Registrazioni in attesa";
-$a->strings["Invalid data packet"] = "Dati ricevuti 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["invalid target signature"] = "la firma ricevuta non è valida";
$a->strings["Logout"] = "Esci";
$a->strings["End this session"] = "Chiudi questa sessione";
$a->strings["Home"] = "Bacheca";
@@ -956,7 +949,7 @@ $a->strings["Create an account"] = "Crea un account";
$a->strings["Help and documentation"] = "Guida e documentazione";
$a->strings["Applications, utilities, links, games"] = "Applicazioni, utilità, link, giochi";
$a->strings["Search site @name, #tag, ?docs, content"] = "Cerca nel sito per @nome, #tag, ?guida o per contenuto";
-$a->strings["Channel Directory"] = "Elenco pubblico canali";
+$a->strings["Channel Directory"] = "Elenchi pubblici dei canali";
$a->strings["Grid"] = "Rete";
$a->strings["Your grid"] = "La tua rete";
$a->strings["Mark all grid notifications seen"] = "Segna come lette le notifiche della tua rete";
@@ -978,6 +971,12 @@ $a->strings["Account/Channel Settings"] = "Impostazioni dell'account e del canal
$a->strings["Site Setup and Configuration"] = "Installazione e configurazione del sito";
$a->strings["@name, #tag, ?doc, content"] = "@nome, #tag, ?guida, contenuto";
$a->strings["Please wait..."] = "Attendere...";
+$a->strings["Directory Options"] = "Opzioni per elenchi pubblici";
+$a->strings["Safe Mode"] = "Modalità SafeSearch";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Si";
+$a->strings["Public Forums Only"] = "Solo forum pubblici";
+$a->strings["This Website Only"] = "Solo in questo sito";
$a->strings["Some blurb about what to do when you're new here"] = "Qualche suggerimento per i nuovi utenti su cosa fare";
$a->strings["Contact not found."] = "Contatto non trovato.";
$a->strings["Friend suggestion sent."] = "Suggerimento di amicizia inviato.";
@@ -996,8 +995,8 @@ $a->strings["Public Forum:"] = "Forum pubblico:";
$a->strings["Keywords: "] = "Parole chiave:";
$a->strings["Don't suggest"] = "Non fornire suggerimenti";
$a->strings["Common connections:"] = "Contatti in comune:";
-$a->strings["Global Directory"] = "Elenco globale dei canali";
-$a->strings["Local Directory"] = "Elenco canali su questo server";
+$a->strings["Global Directory"] = "Elenchi pubblici globali";
+$a->strings["Local Directory"] = "Elenco canali su questo hub";
$a->strings["Finding:"] = "Ricerca:";
$a->strings["next page"] = "pagina successiva";
$a->strings["previous page"] = "pagina precedente";
@@ -1075,7 +1074,7 @@ $a->strings["WARNING: "] = "ATTENZIONE:";
$a->strings["This channel will be completely removed from the network. "] = "Questo canale sarà completamente eliminato dalla rete.";
$a->strings["This action is permanent and can not be undone!"] = "Questo comando è definitivo e non può essere annullato!";
$a->strings["Please enter your password for verification:"] = "Inserisci la tua password per verifica:";
-$a->strings["Remove this channel and all its clones from the network"] = "Rimuovi questo canale e tutti i suoi cloni dalla rete";
+$a->strings["Remove this channel and all its clones from the network"] = "Elimina questo canale e tutti i suoi cloni dalla rete";
$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni";
$a->strings["Remove Channel"] = "Elimina questo canale";
$a->strings["- select -"] = "- scegli -";
@@ -1163,7 +1162,7 @@ $a->strings["(%s) would like to connect with you. Please approve this connection
$a->strings["Approve"] = "Approva";
$a->strings["Approve Later"] = "Approva più tardi";
$a->strings["inherited"] = "derivato";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo dopo aver effettuato l'accesso.";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso.";
$a->strings["Their Settings"] = "Permessi concessi a te";
$a->strings["My Settings"] = "Permessi che concedo";
$a->strings["Individual Permissions"] = "Permessi individuali";
@@ -1196,6 +1195,7 @@ $a->strings["Copy/paste this URL to link file from a web page"] = "Copia/incolla
$a->strings["Share this file"] = "Condividi questo file";
$a->strings["Show URL to this file"] = "Mostra l'URL del file";
$a->strings["Notify your contacts about this file"] = "Notifica ai contatti che hai caricato questo file";
+$a->strings["This site is not a directory server"] = "Questo non è un directory server";
$a->strings["Layout Name"] = "Nome layout";
$a->strings["Layout Description (Optional)"] = "Descrizione del layout (facoltativa)";
$a->strings["Comanche page description language help"] = "Guida di Comanche Page Description Language";
@@ -1225,7 +1225,10 @@ $a->strings["Chatroom Name"] = "Nome della chat";
$a->strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
$a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
$a->strings["Search results for: %s"] = "Risultati ricerca: %s";
-$a->strings["Conversation removed."] = "Conversazione rimossa.";
+$a->strings["Website:"] = "Sito web:";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canale remoto [%s] (non ancora conosciuto da questo sito)";
+$a->strings["Rating (this information is public)"] = "Valutazione (visibile a tutti)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Commento alla valutazione (facoltativo, visibile a tutti)";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
$a->strings["Item not found"] = "Elemento non trovato";
$a->strings["Item is not editable"] = "L'elemento non è modificabile";
@@ -1244,6 +1247,10 @@ $a->strings["accepted for delivery"] = "accettato per la spedizione";
$a->strings["updated"] = "aggiornato";
$a->strings["update ignored"] = "aggiornamento ignorato";
$a->strings["permission denied"] = "permessi non sufficienti";
+$a->strings["recipient not found"] = "Destinatario non trovato";
+$a->strings["mail recalled"] = "messaggio richiamato dal mittente";
+$a->strings["duplicate mail received"] = "ricevuto messaggio duplicato";
+$a->strings["mail delivered"] = "messaggio recapitato";
$a->strings["Delete block?"] = "Vuoi eliminare questo riquadro?";
$a->strings["Edit Block"] = "Modifica il riquadro";
$a->strings["\$Projectname"] = "\$Projectname";
@@ -1319,7 +1326,7 @@ $a->strings["Check to block public access to all otherwise public personal pages
$a->strings["Verify Email Addresses"] = "Verifica l'indirizzo email";
$a->strings["Check to verify email addresses used in account registration (recommended)."] = "Attiva per richiedere la verifica degli indirizzi email dei nuovi utenti (consigliato).";
$a->strings["Force publish"] = "Forza la publicazione del profilo";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per mostrare nell'elenco pubblico <strong>tutti</strong> i profili registrati su questo sito.";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per mostrare negli elenchi pubblici <strong>tutti</strong> i profili registrati su questo sito.";
$a->strings["Disable discovery tab"] = "Disabilita la funzione 'scopri'";
$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Nell'area della rete personale non comparirà più la scheda con i contenuti acquisiti da altri siti.";
$a->strings["login on Homepage"] = "Mostra il login sulla homepage";
@@ -1549,10 +1556,6 @@ $a->strings["Map"] = "Mappa";
$a->strings["View Album"] = "Guarda l'album";
$a->strings["Recent Photos"] = "Foto recenti";
$a->strings["\$Projectname channel"] = "Canale \$Projectname";
-$a->strings["Website:"] = "Sito web:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canale remoto [%s] (non ancora conosciuto da questo sito)";
-$a->strings["Rating (this information is public)"] = "Valutazione (visibile a tutti)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Commento alla valutazione (facoltativo, visibile a tutti)";
$a->strings["Calendar entries imported."] = "Le voci del calendario sono state importate.";
$a->strings["No calendar entries found."] = "Non sono state trovate voci del calendario.";
$a->strings["Event can not end before it has started."] = "Un evento non può terminare prima del suo inizio.";
@@ -1575,7 +1578,7 @@ $a->strings["Event Starts:"] = "Inizio:";
$a->strings["Finish date/time is not known or not relevant"] = "La data/ora di fine non è rilevante";
$a->strings["Event Finishes:"] = "Fine:";
$a->strings["Adjust for viewer timezone"] = "Adatta al fuso orario di chi legge";
-$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con l'orario di un luogo particolare.";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con un certo fuso orario.";
$a->strings["Title:"] = "Titolo:";
$a->strings["Share this event"] = "Condividi questo evento";
$a->strings["%s element installed"] = "%s elemento installato";
@@ -1615,25 +1618,27 @@ $a->strings["Ratings"] = "Valutazioni";
$a->strings["Rating: "] = "Valutazione:";
$a->strings["Website: "] = "Sito web:";
$a->strings["Description: "] = "Descrizione:";
-$a->strings["This site is not a directory server"] = "Questo non è un server di elenchi di canali";
$a->strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
$a->strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
$a->strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
$a->strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
$a->strings["Messages"] = "Messaggi";
-$a->strings["Message deleted."] = "Messaggio eliminato.";
$a->strings["Message recalled."] = "Messaggio revocato.";
+$a->strings["Conversation removed."] = "Conversazione rimossa.";
+$a->strings["Requested channel is not in this network"] = "Il canale cercato non è in questa rete";
$a->strings["Send Private Message"] = "Invia un messaggio privato";
$a->strings["To:"] = "A:";
$a->strings["Subject:"] = "Oggetto:";
$a->strings["Your message:"] = "Il tuo messaggio:";
$a->strings["Send"] = "Invia";
$a->strings["Delete message"] = "Elimina il messaggio";
+$a->strings["Delivery report"] = "Rapporto di trasmissione";
$a->strings["Recall message"] = "Revoca il messaggio";
$a->strings["Message has been recalled."] = "Il messaggio è stato revocato.";
$a->strings["Delete Conversation"] = "Elimina la conversazione";
$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
$a->strings["Send Reply"] = "Invia la risposta";
+$a->strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
$a->strings["Page Title"] = "Titolo della pagina";
$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "È stato superato il numero massimo giornaliero di registrazioni a questo sito. Riprova domani!";
$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Impossibile proseguire. Devi prima accettare le Condizioni d'Uso del servizio.";
@@ -1662,6 +1667,7 @@ $a->strings["By default only the instances of the channels located on this hub w
$a->strings["Remove Account"] = "Elimina l'account";
$a->strings["No service class restrictions found."] = "Non esistono restrizioni su questa classe di account.";
$a->strings["Item not available."] = "Elemento non disponibile.";
+$a->strings["This directory server requires an access token"] = "Questo server di elenchi pubblici necessita di un token di autenticazione";
$a->strings["Failed to create source. No channel selected."] = "Impossibile creare la sorgente. Nessun canale selezionato.";
$a->strings["Source created."] = "Sorgente creata.";
$a->strings["Source updated."] = "Sorgente aggiornata.";
@@ -1687,7 +1693,6 @@ $a->strings["Authentication failed."] = "Autenticazione fallita.";
$a->strings["Remote Authentication"] = "Accedi tramite il tuo hub";
$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
$a->strings["Authenticate"] = "Accedi";
-$a->strings["This directory server requires an access token"] = "Questo server di elenchi pubblici necessita di un token di autenticazione";
$a->strings["Version %s"] = "Versione %s";
$a->strings["Installed plugins/addons/apps:"] = "App e componenti installati:";
$a->strings["No installed plugins/addons/apps"] = "Nessuna app o componente installato";
@@ -1728,7 +1733,7 @@ $a->strings["item not found."] = "non trovato.";
$a->strings["Edit Thing"] = "Modifica l'oggetto";
$a->strings["Select a profile"] = "Scegli un profilo";
$a->strings["Post an activity"] = "Pubblica un'attività";
-$a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo";
+$a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo scelto";
$a->strings["Name of thing e.g. something"] = "Nome dell'oggetto";
$a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (opzionale)";
$a->strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
@@ -1819,7 +1824,7 @@ $a->strings["Anybody on this website"] = "Chiunque su questo hub";
$a->strings["Anybody in this network"] = "Chiunque su questa rete";
$a->strings["Anybody authenticated"] = "Chiunque abbia effettuato l'accesso";
$a->strings["Anybody on the internet"] = "Chiunque su internet";
-$a->strings["Publish your default profile in the network directory"] = "Mostra il mio profilo predefinito nell'elenco pubblico dei canali";
+$a->strings["Publish your default profile in the network directory"] = "Mostra il mio profilo predefinito negli elenchi pubblici dei canali";
$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come amico ai nuovi membri?";
$a->strings["Your channel address is"] = "L'indirizzo del tuo canale è";
$a->strings["Channel Settings"] = "Impostazioni del canale";
@@ -2094,7 +2099,7 @@ $a->strings["Homepage URL:"] = "Indirizzo home page:";
$a->strings["Religious Views:"] = "Orientamento religioso:";
$a->strings["Keywords:"] = "Parole chiave, tag:";
$a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione";
-$a->strings["Used in directory listings"] = "Visibile nell'elenco pubblico di canali";
+$a->strings["Used in directory listings"] = "Visibile sugli elenchi pubblici di canali";
$a->strings["Tell us about yourself..."] = "Raccontaci di te...";
$a->strings["Hobbies/Interests"] = "Hobby/interessi";
$a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network";
diff --git a/view/js/main.js b/view/js/main.js
index 34d6bf475..0c26e3d57 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -616,11 +616,12 @@ function updateConvItems(mode,data) {
function collapseHeight() {
$(".wall-item-content, .directory-collapse").each(function() {
- var orgHeight = $(this).height();
+ var orgHeight = $(this).outerHeight(true);
if(orgHeight > divmore_height + 10) {
if(! $(this).hasClass('divmore')) {
$(this).readmore({
speed: 0,
+ heightMargin: 50,
collapsedHeight: divmore_height,
moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 32e3a5714..2c55d42fb 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-02 00:03-0700\n"
-"PO-Revision-Date: 2015-10-03 12:48+0000\n"
+"POT-Creation-Date: 2015-10-09 00:03-0700\n"
+"PO-Revision-Date: 2015-10-12 22:38+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -321,14 +321,13 @@ msgstr "Chatkanaal niet gevonden"
#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/events.php:256
#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
-#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/mail.php:114 ../../mod/message.php:16 ../../mod/webpages.php:69
#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
-#: ../../mod/regmod.php:17 ../../mod/mail.php:114 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/regmod.php:17 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
@@ -775,16 +774,16 @@ msgstr "Omschrijving (optioneel)"
#: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99
#: ../../mod/pdledit.php:58 ../../mod/photos.php:598 ../../mod/photos.php:969
#: ../../mod/photos.php:1009 ../../mod/photos.php:1127
-#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/mail.php:380 ../../mod/import.php:511
-#: ../../mod/thing.php:313 ../../mod/thing.php:359 ../../mod/invite.php:142
-#: ../../mod/settings.php:583 ../../mod/settings.php:695
-#: ../../mod/settings.php:723 ../../mod/settings.php:746
-#: ../../mod/settings.php:831 ../../mod/settings.php:1020
-#: ../../mod/xchan.php:11 ../../mod/group.php:81 ../../mod/connect.php:93
-#: ../../mod/locs.php:108 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/profiles.php:667 ../../mod/import_items.php:122
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/mail.php:359
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:511 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/settings.php:695 ../../mod/settings.php:723
+#: ../../mod/settings.php:746 ../../mod/settings.php:831
+#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/locs.php:108 ../../mod/setup.php:331
+#: ../../mod/setup.php:371 ../../mod/profiles.php:667
+#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Opslaan"
@@ -1309,9 +1308,8 @@ msgstr "In context bekijken"
#: ../../include/conversation.php:739 ../../include/conversation.php:1212
#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:249
-#: ../../mod/mail.php:381 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:150 ../../mod/photos.php:990
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
msgid "Please wait"
msgstr "Even wachten"
@@ -1414,7 +1412,7 @@ msgid "Visible to <strong>everybody</strong>"
msgstr "Voor <strong>iedereen</strong> zichtbaar"
#: ../../include/conversation.php:1144 ../../mod/mail.php:182
-#: ../../mod/mail.php:311
+#: ../../mod/mail.php:296
msgid "Please enter a link URL:"
msgstr "Vul een internetadres/URL in:"
@@ -1439,7 +1437,7 @@ msgid "Where are you right now?"
msgstr "Waar bevind je je op dit moment?"
#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:183 ../../mod/mail.php:312
+#: ../../mod/mail.php:183 ../../mod/mail.php:297
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verloopt op DD-MM-YYYY om HH:MM"
@@ -1496,8 +1494,8 @@ msgid "Code"
msgstr "Broncode"
#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:246 ../../mod/mail.php:377
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
+#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr "Foto uploaden"
@@ -1506,7 +1504,7 @@ msgid "upload photo"
msgstr "foto uploaden"
#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:247 ../../mod/mail.php:378
+#: ../../mod/editblock.php:143 ../../mod/mail.php:228 ../../mod/mail.php:357
#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
msgid "Attach file"
msgstr "Bestand toevoegen"
@@ -1516,7 +1514,7 @@ msgid "attach file"
msgstr "bestand toevoegen"
#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:248 ../../mod/mail.php:379
+#: ../../mod/editblock.php:144 ../../mod/mail.php:229 ../../mod/mail.php:358
#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
msgid "Insert web link"
msgstr "Weblink invoegen"
@@ -1599,13 +1597,13 @@ msgid "Example: bob@example.com, mary@example.com"
msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:253 ../../mod/mail.php:384
+#: ../../mod/editblock.php:176 ../../mod/mail.php:233 ../../mod/mail.php:362
#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
msgid "Set expiration date"
msgstr "Verloopdatum instellen"
#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:255 ../../mod/mail.php:386
+#: ../../mod/editpost.php:158 ../../mod/mail.php:235 ../../mod/mail.php:364
msgid "Encrypt text"
msgstr "Tekst versleutelen"
@@ -1819,206 +1817,27 @@ msgstr "Foto kan niet worden opgeslagen"
msgid "Upload New Photos"
msgstr "Nieuwe foto's uploaden"
-#: ../../include/enotify.php:57 ../../include/network.php:1613
+#: ../../include/network.php:635
+msgid "view full size"
+msgstr "volledige grootte tonen"
+
+#: ../../include/network.php:1613 ../../include/enotify.php:57
msgid "$Projectname Notification"
msgstr "$Projectname-notificatie"
-#: ../../include/enotify.php:58 ../../include/network.php:1614
+#: ../../include/network.php:1614 ../../include/enotify.php:58
msgid "$projectname"
msgstr "$projectname"
-#: ../../include/enotify.php:60 ../../include/network.php:1616
+#: ../../include/network.php:1616 ../../include/enotify.php:60
msgid "Thank You,"
msgstr "Bedankt,"
-#: ../../include/enotify.php:62 ../../include/network.php:1618
+#: ../../include/network.php:1618 ../../include/enotify.php:62
#, php-format
msgid "%s Administrator"
msgstr "Beheerder %s"
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s zond jou %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "een privébericht"
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
-
-#: ../../include/enotify.php:158
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]"
-
-#: ../../include/enotify.php:166
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]"
-
-#: ../../include/enotify.php:175
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
-
-#: ../../include/enotify.php:187
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt."
-
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
-
-#: ../../include/enotify.php:196
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
-
-#: ../../include/enotify.php:224
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
-
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s noemde jou op %3$s"
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
-
-#: ../../include/enotify.php:238
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
-
-#: ../../include/enotify.php:239
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s heeft je aangestoten op %3$s"
-
-#: ../../include/enotify.php:240
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
-
-#: ../../include/enotify.php:256
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
-
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd"
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
-
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
-
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s"
-
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s."
-
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Je kan het profiel bekijken op %s"
-
-#: ../../include/enotify.php:278
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
-
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
-
-#: ../../include/enotify.php:286
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s"
-
-#: ../../include/enotify.php:287
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s."
-
-#: ../../include/enotify.php:293
-msgid "Name:"
-msgstr "Naam:"
-
-#: ../../include/enotify.php:294
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:297
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
-
-#: ../../include/enotify.php:511
-msgid "[Red:Notify]"
-msgstr "[Hubzilla:Notificatie]"
-
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "volledige grootte tonen"
-
#: ../../include/network.php:1660 ../../include/account.php:316
#: ../../include/account.php:343 ../../include/account.php:403
msgid "Administrator"
@@ -2916,6 +2735,185 @@ msgstr "Connectie: %s"
msgid "Connection not found."
msgstr "Connectie niet gevonden."
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s."
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s zond jou %2$s."
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr "een privébericht"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
+
+#: ../../include/enotify.php:158
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]"
+
+#: ../../include/enotify.php:166
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]"
+
+#: ../../include/enotify.php:175
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
+
+#: ../../include/enotify.php:186
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
+
+#: ../../include/enotify.php:187
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt."
+
+#: ../../include/enotify.php:190 ../../include/enotify.php:205
+#: ../../include/enotify.php:231 ../../include/enotify.php:249
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
+
+#: ../../include/enotify.php:196
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst"
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
+
+#: ../../include/enotify.php:224
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
+
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s noemde jou op %3$s"
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
+
+#: ../../include/enotify.php:238
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
+
+#: ../../include/enotify.php:239
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s heeft je aangestoten op %3$s"
+
+#: ../../include/enotify.php:240
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
+
+#: ../../include/enotify.php:256
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
+
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd"
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
+
+#: ../../include/enotify.php:270
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
+
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s"
+
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s."
+
+#: ../../include/enotify.php:276 ../../include/enotify.php:295
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Je kan het profiel bekijken op %s"
+
+#: ../../include/enotify.php:278
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
+
+#: ../../include/enotify.php:285
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
+
+#: ../../include/enotify.php:286
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s"
+
+#: ../../include/enotify.php:287
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s."
+
+#: ../../include/enotify.php:293
+msgid "Name:"
+msgstr "Naam:"
+
+#: ../../include/enotify.php:294
+msgid "Photo:"
+msgstr "Foto:"
+
+#: ../../include/enotify.php:297
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
+
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Notificatie]"
+
#: ../../include/bb2diaspora.php:373
msgid "Attachments:"
msgstr "Bijlagen:"
@@ -3773,153 +3771,149 @@ msgid "Private Mail Menu"
msgstr "Privéberichten"
#: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Controleer op nieuwe berichten"
-
-#: ../../include/widgets.php:575
msgid "Combined View"
msgstr "Gecombineerd postvak"
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
msgid "Inbox"
msgstr "Postvak IN"
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
msgid "Outbox"
msgstr "Postvak UIT"
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
msgid "New Message"
msgstr "Nieuw bericht"
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
msgid "Conversations"
msgstr "Conversaties"
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
msgid "Received Messages"
msgstr "Ontvangen berichten"
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
msgid "Sent Messages"
msgstr "Verzonden berichten"
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
msgid "No messages."
msgstr "Geen berichten"
-#: ../../include/widgets.php:649
+#: ../../include/widgets.php:643
msgid "Delete conversation"
msgstr "Verwijder conversatie"
-#: ../../include/widgets.php:651
+#: ../../include/widgets.php:645
msgid "D, d M Y - g:i A"
msgstr "D, j M Y - G:i"
-#: ../../include/widgets.php:740
+#: ../../include/widgets.php:734
msgid "Chat Rooms"
msgstr "Chatkanalen"
-#: ../../include/widgets.php:760
+#: ../../include/widgets.php:754
msgid "Bookmarked Chatrooms"
msgstr "Bladwijzers van chatkanalen"
-#: ../../include/widgets.php:780
+#: ../../include/widgets.php:774
msgid "Suggested Chatrooms"
msgstr "Voorgestelde chatkanalen"
-#: ../../include/widgets.php:907 ../../include/widgets.php:965
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
msgid "photo/image"
msgstr "foto/afbeelding"
-#: ../../include/widgets.php:1060 ../../include/widgets.php:1062
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
msgid "Rate Me"
msgstr "Beoordeel mij"
-#: ../../include/widgets.php:1066
+#: ../../include/widgets.php:1060
msgid "View Ratings"
msgstr "Bekijk beoordelingen"
-#: ../../include/widgets.php:1077
+#: ../../include/widgets.php:1071
msgid "Public Hubs"
msgstr "Openbare hubs"
-#: ../../include/widgets.php:1125
+#: ../../include/widgets.php:1119
msgid "Forums"
msgstr "Forums"
-#: ../../include/widgets.php:1152
+#: ../../include/widgets.php:1146
msgid "Tasks"
msgstr "Taken"
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1155
msgid "Documentation"
msgstr "Documentatie"
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1157
msgid "Project/Site Information"
msgstr "Project- en hub-informatie"
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1158
msgid "For Members"
msgstr "Voor leden"
-#: ../../include/widgets.php:1165
+#: ../../include/widgets.php:1159
msgid "For Administrators"
msgstr "Voor beheerders"
-#: ../../include/widgets.php:1166
+#: ../../include/widgets.php:1160
msgid "For Developers"
msgstr "Voor ontwikkelaars"
-#: ../../include/widgets.php:1191 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
msgid "Site"
msgstr "Hub-instellingen"
-#: ../../include/widgets.php:1192
+#: ../../include/widgets.php:1186
msgid "Accounts"
msgstr "Accounts"
-#: ../../include/widgets.php:1193 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
msgid "Channels"
msgstr "Kanalen"
-#: ../../include/widgets.php:1194 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
#: ../../mod/admin.php:1071
msgid "Plugins"
msgstr "Plug-ins"
-#: ../../include/widgets.php:1195 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
#: ../../mod/admin.php:1265
msgid "Themes"
msgstr "Thema's"
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1190
msgid "Inspect queue"
msgstr "Inspecteer berichtenwachtrij"
-#: ../../include/widgets.php:1197
+#: ../../include/widgets.php:1191
msgid "Profile Config"
msgstr "Profielconfiguratie"
-#: ../../include/widgets.php:1198
+#: ../../include/widgets.php:1192
msgid "DB updates"
msgstr "Database-updates"
-#: ../../include/widgets.php:1216 ../../include/widgets.php:1222
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
#: ../../mod/admin.php:1350
msgid "Logs"
msgstr "Logboeken"
-#: ../../include/widgets.php:1220 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
msgid "Admin"
msgstr "Beheer"
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1215
msgid "Plugin Features"
msgstr "Plug-in-opties"
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1217
msgid "User registrations waiting for confirmation"
msgstr "Accounts die op goedkeuring wachten"
@@ -6837,6 +6831,93 @@ msgstr "Website: "
msgid "Description: "
msgstr "Omschrijving: "
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Niet in staat om ontvanger op te zoeken."
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "Kan opgevraagd kanaal niet verifieren"
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
+
+#: ../../mod/mail.php:128
+msgid "Messages"
+msgstr "Berichten"
+
+#: ../../mod/mail.php:155
+msgid "Message recalled."
+msgstr "Bericht ingetrokken."
+
+#: ../../mod/mail.php:168
+msgid "Conversation removed."
+msgstr "Conversatie verwijderd"
+
+#: ../../mod/mail.php:211
+msgid "Requested channel is not in this network"
+msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
+
+#: ../../mod/mail.php:219
+msgid "Send Private Message"
+msgstr "Privébericht versturen"
+
+#: ../../mod/mail.php:220 ../../mod/mail.php:349
+msgid "To:"
+msgstr "Aan:"
+
+#: ../../mod/mail.php:223 ../../mod/mail.php:351
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: ../../mod/mail.php:226 ../../mod/invite.php:131
+msgid "Your message:"
+msgstr "Jouw bericht:"
+
+#: ../../mod/mail.php:230
+msgid "Send"
+msgstr "Verzenden"
+
+#: ../../mod/mail.php:321
+msgid "Delete message"
+msgstr "Bericht verwijderen"
+
+#: ../../mod/mail.php:322
+msgid "Delivery report"
+msgstr "Afleveringsrapport"
+
+#: ../../mod/mail.php:323
+msgid "Recall message"
+msgstr "Bericht intrekken"
+
+#: ../../mod/mail.php:325
+msgid "Message has been recalled."
+msgstr "Bericht is ingetrokken."
+
+#: ../../mod/mail.php:342
+msgid "Delete Conversation"
+msgstr "Verwijder conversatie"
+
+#: ../../mod/mail.php:344
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
+
+#: ../../mod/mail.php:348
+msgid "Send Reply"
+msgstr "Antwoord versturen"
+
+#: ../../mod/mail.php:353
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Jouw privébericht aan %s (%s):"
+
#: ../../mod/webpages.php:191
msgid "Page Title"
msgstr "Paginatitel"
@@ -7072,84 +7153,6 @@ msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)"
msgid "Authenticate"
msgstr "Authenticeren"
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Niet in staat om ontvanger op te zoeken."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Kan opgevraagd kanaal niet verifieren"
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Berichten"
-
-#: ../../mod/mail.php:155
-msgid "Message recalled."
-msgstr "Bericht ingetrokken."
-
-#: ../../mod/mail.php:168
-msgid "Conversation removed."
-msgstr "Conversatie verwijderd"
-
-#: ../../mod/mail.php:233
-msgid "Send Private Message"
-msgstr "Privébericht versturen"
-
-#: ../../mod/mail.php:234 ../../mod/mail.php:368
-msgid "To:"
-msgstr "Aan:"
-
-#: ../../mod/mail.php:239 ../../mod/mail.php:370
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: ../../mod/mail.php:243 ../../mod/mail.php:373 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: ../../mod/mail.php:250
-msgid "Send"
-msgstr "Verzenden"
-
-#: ../../mod/mail.php:336
-msgid "Delete message"
-msgstr "Bericht verwijderen"
-
-#: ../../mod/mail.php:337
-msgid "Delivery report"
-msgstr "Afleveringsrapport"
-
-#: ../../mod/mail.php:338
-msgid "Recall message"
-msgstr "Bericht intrekken"
-
-#: ../../mod/mail.php:340
-msgid "Message has been recalled."
-msgstr "Bericht is ingetrokken."
-
-#: ../../mod/mail.php:361
-msgid "Delete Conversation"
-msgstr "Verwijder conversatie"
-
-#: ../../mod/mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
-
-#: ../../mod/mail.php:367
-msgid "Send Reply"
-msgstr "Antwoord versturen"
-
#: ../../mod/siteinfo.php:111
#, php-format
msgid "Version %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 8fa0480a9..5d2daed0c 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -426,47 +426,11 @@ $a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+$a->strings["view full size"] = "volledige grootte tonen";
$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
$a->strings["\$projectname"] = "\$projectname";
$a->strings["Thank You,"] = "Bedankt,";
$a->strings["%s Administrator"] = "Beheerder %s";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
-$a->strings["a private message"] = "een privébericht";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
-$a->strings["[Red:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
-$a->strings["[Red:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
-$a->strings["Name:"] = "Naam:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
-$a->strings["[Red:Notify]"] = "[Hubzilla:Notificatie]";
-$a->strings["view full size"] = "volledige grootte tonen";
$a->strings["Administrator"] = "Beheerder";
$a->strings["No Subject"] = "Geen onderwerp";
$a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
@@ -680,6 +644,42 @@ $a->strings["Collection is empty."] = "Collectie is leeg";
$a->strings["Collection: %s"] = "Collectie: %s";
$a->strings["Connection: %s"] = "Connectie: %s";
$a->strings["Connection not found."] = "Connectie niet gevonden.";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
+$a->strings["a private message"] = "een privébericht";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
+$a->strings["Name:"] = "Naam:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
$a->strings["Attachments:"] = "Bijlagen:";
$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
$a->strings["Image/photo"] = "Afbeelding/foto";
@@ -890,7 +890,6 @@ $a->strings["Export channel"] = "Kanaal exporteren";
$a->strings["Connection Default Permissions"] = "Standaard permissies voor connecties";
$a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal";
$a->strings["Private Mail Menu"] = "Privéberichten";
-$a->strings["Check Mail"] = "Controleer op nieuwe berichten";
$a->strings["Combined View"] = "Gecombineerd postvak";
$a->strings["Inbox"] = "Postvak IN";
$a->strings["Outbox"] = "Postvak UIT";
@@ -1619,6 +1618,27 @@ $a->strings["Ratings"] = "Waarderingen";
$a->strings["Rating: "] = "Waardering: ";
$a->strings["Website: "] = "Website: ";
$a->strings["Description: "] = "Omschrijving: ";
+$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
+$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
+$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
+$a->strings["Messages"] = "Berichten";
+$a->strings["Message recalled."] = "Bericht ingetrokken.";
+$a->strings["Conversation removed."] = "Conversatie verwijderd";
+$a->strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
+$a->strings["Send Private Message"] = "Privébericht versturen";
+$a->strings["To:"] = "Aan:";
+$a->strings["Subject:"] = "Onderwerp:";
+$a->strings["Your message:"] = "Jouw bericht:";
+$a->strings["Send"] = "Verzenden";
+$a->strings["Delete message"] = "Bericht verwijderen";
+$a->strings["Delivery report"] = "Afleveringsrapport";
+$a->strings["Recall message"] = "Bericht intrekken";
+$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
+$a->strings["Delete Conversation"] = "Verwijder conversatie";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
+$a->strings["Send Reply"] = "Antwoord versturen";
+$a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
$a->strings["Page Title"] = "Paginatitel";
$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze \$Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals.";
$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden.";
@@ -1673,25 +1693,6 @@ $a->strings["Authentication failed."] = "Authenticatie mislukt.";
$a->strings["Remote Authentication"] = "Authenticatie op afstand";
$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)";
$a->strings["Authenticate"] = "Authenticeren";
-$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
-$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
-$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
-$a->strings["Messages"] = "Berichten";
-$a->strings["Message recalled."] = "Bericht ingetrokken.";
-$a->strings["Conversation removed."] = "Conversatie verwijderd";
-$a->strings["Send Private Message"] = "Privébericht versturen";
-$a->strings["To:"] = "Aan:";
-$a->strings["Subject:"] = "Onderwerp:";
-$a->strings["Your message:"] = "Jouw bericht:";
-$a->strings["Send"] = "Verzenden";
-$a->strings["Delete message"] = "Bericht verwijderen";
-$a->strings["Delivery report"] = "Afleveringsrapport";
-$a->strings["Recall message"] = "Bericht intrekken";
-$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
-$a->strings["Delete Conversation"] = "Verwijder conversatie";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
-$a->strings["Send Reply"] = "Antwoord versturen";
$a->strings["Version %s"] = "Versie %s";
$a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:";
$a->strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plug-ins/add-ons/apps";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b51fea6cf..59b928ee9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -129,7 +129,7 @@ pre code {
code {
font-size: 1em;
- padding: 5px;
+ padding: 1em;
border: 1px solid #ccc;
background: #ccc;
color: #000;
@@ -1432,7 +1432,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
.profile-match-connect { margin-top: 5px; }
.reshared-content { margin-left: 20px; }
-.shared_header img { margin-right: 10px; }
+.shared_header img {
+ border-radius: $radiuspx;
+ margin-right: 10px;
+}
.tag1 {
font-size : 0.9em !important;
@@ -1635,39 +1638,39 @@ img.mail-conv-sender-photo {
/* conversation */
-.wall-item-title {
- font-size: $font_size;
+.wall-item-head {
+ padding: 10px 10px 0px 10px;
}
-.hide-comments-outer,
-.thread-wrapper .wall-item-comment-wrapper,
-.wall-item-content-wrapper.comment {
- margin-left: $comment_indent;
+.wall-item-content {
+ padding: 1em 10px;
+}
+
+.wall-item-tools {
+ padding: 0px 10px 10px 10px;
+}
+
+
+.wall-item-title {
+ font-size: $font_size;
}
.wall-item-content-wrapper {
background-color: $item_colour;
- padding: 10px;
border-top-right-radius: $radiuspx;
border-top-left-radius: $radiuspx;
}
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
- border-color: $comment_border_colour;
- border-style: solid;
- border-width: 0px 0px 0px 3px;
- border-radius: 0px;
- padding: 7px 10px 7px 7px;
}
.hide-comments-outer {
background-color: $comment_item_colour;
- border-color: $comment_border_colour;
border-top-color: #ccc;
border-style: solid;
border-top-style: dashed;
- border-width: 1px 0px 0px 3px;
+ border-width: 1px 0px 0px 0px;
text-align: center;
border-radius: 0px;
}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 4f5b69beb..cdc9de489 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -16,8 +16,8 @@
{{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}}
{{include file="field_colorinput.tpl" field=$comment_item_colour}}
- {{include file="field_colorinput.tpl" field=$comment_border_colour}}
- {{include file="field_input.tpl" field=$comment_indent}}
+ {{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
+ {{*include file="field_input.tpl" field=$comment_indent*}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index dc8064f1a..a9661d9b5 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -8,30 +8,32 @@
<a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
- <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
- <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
- <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+ <div class="wall-item-head">
+ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+ <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+ </div>
+ <div class="wall-item-photo-end" style="clear:both"></div>
</div>
- <div class="wall-item-photo-end" style="clear:both"></div>
- </div>
- {{if $item.title}}
- <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
- <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
- </div>
- {{/if}}
- {{if $item.lock}}
- <div class="wall-item-lock dropdown">
- <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
- </div>
- {{/if}}
- <div class="wall-item-author">
- <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
- </div>
- <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
- {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ {{if $item.title}}
+ <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+ <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+ </div>
+ {{/if}}
+ {{if $item.lock}}
+ <div class="wall-item-lock dropdown">
+ <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+ </div>
+ {{/if}}
+ <div class="wall-item-author">
+ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+ </div>
+ <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
+ {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ </div>
+ <div class="clear"></div>
</div>
<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
- <div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
{{$item.body}}
{{if $item.tags}}
@@ -52,6 +54,7 @@
</div>
{{/if}}
</div>
+ <div class="clear"></div>
</div>
<div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right">
@@ -167,6 +170,7 @@
{{/foreach}}
</div>
{{/if}}
+ <div class="clear"></div>
</div>
<div class="clear"></div>
</div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 5487d5937..b10f50c13 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -8,30 +8,32 @@
<a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
- <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
- <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
- <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+ <div class="wall-item-head">
+ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+ <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+ </div>
+ <div class="wall-item-photo-end" style="clear:both"></div>
</div>
- <div class="wall-item-photo-end" style="clear:both"></div>
- </div>
- {{if $item.title}}
- <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
- <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
- </div>
- {{/if}}
- {{if $item.lock}}
- <div class="wall-item-lock dropdown">
- <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
- </div>
- {{/if}}
- <div class="wall-item-author">
- <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
- </div>
- <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
- {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ {{if $item.title}}
+ <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+ <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+ </div>
+ {{/if}}
+ {{if $item.lock}}
+ <div class="wall-item-lock dropdown">
+ <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+ </div>
+ {{/if}}
+ <div class="wall-item-author">
+ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+ </div>
+ <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
+ {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ </div>
+ <div class="clear"></div>
</div>
<div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}">
- <div class="wall-item-title-end"></div>
<div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" >
{{$item.body}}
{{if $item.tags}}
@@ -52,6 +54,7 @@
</div>
{{/if}}
</div>
+ <div class="clear"></div>
</div>
<div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right">
@@ -176,6 +179,7 @@
{{/foreach}}
{{/if}}
</div>
+ <div class="clear"></div>
</div>
<div class="clear"></div>
</div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 225b4f6b0..867a1e87b 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -133,14 +133,14 @@
{{/if}}
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">
- <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
- <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+ <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
+ <i class="icon-thumbs-up-alt" title="{{$likebuttons.likethis}}"></i>
</button>
- <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
- <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
+ <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
+ <i class="icon-thumbs-down-alt" title="{{$likebuttons.nolike}}"></i>
</button>
</div>
- <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
+ <div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
{{/if}}
<div class="clear"></div>
</div>