diff --git a/view/es/messages.po b/view/es/messages.po
index b9953cc3f8..3487e558b8 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-09-16 10:00-0700\n"
-"PO-Revision-Date: 2012-09-16 22:25+0000\n"
+"POT-Creation-Date: 2012-09-25 10:00-0700\n"
+"PO-Revision-Date: 2012-09-26 08:15+0000\n"
 "Last-Translator: Carlos Solís <csolisr@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgid "Return to contact editor"
 msgstr "Volver al editor de contactos"
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:545
-#: ../../mod/settings.php:571 ../../mod/admin.php:690 ../../mod/admin.php:699
+#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
 msgid "Name"
 msgstr "Nombre"
 
@@ -133,23 +133,23 @@ msgid "New photo from this URL"
 msgstr "Nueva foto de esta dirección"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:439 ../../mod/photos.php:1005
+#: ../../mod/events.php:455 ../../mod/photos.php:1005
 #: ../../mod/photos.php:1081 ../../mod/photos.php:1338
 #: ../../mod/photos.php:1378 ../../mod/photos.php:1419
 #: ../../mod/photos.php:1451 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:691 ../../mod/contacts.php:348
+#: ../../mod/content.php:693 ../../mod/contacts.php:348
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
-#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:687
-#: ../../mod/admin.php:823 ../../mod/admin.php:1022 ../../mod/admin.php:1109
+#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
+#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
 #: ../../mod/profiles.php:583 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
-#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
@@ -177,13 +177,13 @@ msgstr "Nueva foto de esta dirección"
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
-#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
-#: ../../addon/posterous/posterous.php:103
+#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
+#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:601 ../../object/Item.php:532
+#: ../../include/conversation.php:607 ../../object/Item.php:559
 msgid "Submit"
 msgstr "Envíar"
 
@@ -230,91 +230,91 @@ msgstr "Recomienda un amigo a %s"
 msgid "Event title and start time are required."
 msgstr "Título del evento y hora de inicio requeridas."
 
-#: ../../mod/events.php:263
+#: ../../mod/events.php:279
 msgid "l, F j"
 msgstr "l, F j"
 
-#: ../../mod/events.php:285
+#: ../../mod/events.php:301
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: ../../mod/events.php:307 ../../include/text.php:1147
+#: ../../mod/events.php:323 ../../include/text.php:1187
 msgid "link to source"
 msgstr "Enlace al original"
 
-#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131
 #: ../../include/nav.php:52 ../../boot.php:1689
 msgid "Events"
 msgstr "Eventos"
 
-#: ../../mod/events.php:332
+#: ../../mod/events.php:348
 msgid "Create New Event"
 msgstr "Crea un evento nuevo"
 
-#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "Previo"
 
-#: ../../mod/events.php:334 ../../mod/install.php:205
+#: ../../mod/events.php:350 ../../mod/install.php:205
 #: ../../addon/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../../mod/events.php:407
+#: ../../mod/events.php:423
 msgid "hour:minute"
 msgstr "hora:minuto"
 
-#: ../../mod/events.php:417
+#: ../../mod/events.php:433
 msgid "Event details"
 msgstr "Detalles del evento"
 
-#: ../../mod/events.php:418
+#: ../../mod/events.php:434
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr "El formato es %s %s. Fecha de inicio y título son obligatorios."
 
-#: ../../mod/events.php:420
+#: ../../mod/events.php:436
 msgid "Event Starts:"
 msgstr "Inicio del evento:"
 
-#: ../../mod/events.php:420 ../../mod/events.php:434
+#: ../../mod/events.php:436 ../../mod/events.php:450
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:439
 msgid "Finish date/time is not known or not relevant"
 msgstr "La fecha/hora de finalización no es conocida o es irrelevante."
 
-#: ../../mod/events.php:425
+#: ../../mod/events.php:441
 msgid "Event Finishes:"
 msgstr "Finalización del evento:"
 
-#: ../../mod/events.php:428
+#: ../../mod/events.php:444
 msgid "Adjust for viewer timezone"
 msgstr "Ajuste de zona horaria"
 
-#: ../../mod/events.php:430
+#: ../../mod/events.php:446
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../mod/events.php:432 ../../mod/directory.php:134
+#: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
 #: ../../boot.php:1226
 msgid "Location:"
 msgstr "Localización:"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:450
 msgid "Title:"
 msgstr "Título:"
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:452
 msgid "Share this event"
 msgstr "Comparte este evento"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1283
+#: ../../include/conversation.php:1307
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -435,9 +435,9 @@ msgstr "ha sido etiquetado en"
 
 #: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439
 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125
-#: ../../include/conversation.php:255
+#: ../../include/conversation.php:253
 msgid "photo"
 msgstr "foto"
 
@@ -543,8 +543,8 @@ msgstr "Modificar foto"
 msgid "Use as profile photo"
 msgstr "Usar como foto del perfil"
 
-#: ../../mod/photos.php:1224 ../../mod/content.php:601
-#: ../../include/conversation.php:428 ../../object/Item.php:103
+#: ../../mod/photos.php:1224 ../../mod/content.php:603
+#: ../../include/conversation.php:436 ../../object/Item.php:103
 msgid "Private Message"
 msgstr "Mensaje privado"
 
@@ -585,52 +585,52 @@ msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Ejemplo: @juan, @Barbara_Ruiz, @julia@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1356 ../../mod/content.php:665
-#: ../../include/conversation.php:575 ../../object/Item.php:185
+#: ../../mod/photos.php:1356 ../../mod/content.php:667
+#: ../../include/conversation.php:581 ../../object/Item.php:195
 msgid "I like this (toggle)"
 msgstr "Me gusta esto (cambiar)"
 
-#: ../../mod/photos.php:1357 ../../mod/content.php:666
-#: ../../include/conversation.php:576 ../../object/Item.php:186
+#: ../../mod/photos.php:1357 ../../mod/content.php:668
+#: ../../include/conversation.php:582 ../../object/Item.php:196
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1268
 msgid "Share"
 msgstr "Compartir"
 
 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
-#: ../../mod/content.php:482 ../../mod/content.php:843
+#: ../../mod/content.php:482 ../../mod/content.php:845
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:671
-#: ../../include/conversation.php:921 ../../include/conversation.php:1263
-#: ../../object/Item.php:237
+#: ../../mod/message.php:481 ../../include/conversation.php:686
+#: ../../include/conversation.php:944 ../../include/conversation.php:1287
+#: ../../object/Item.php:257
 msgid "Please wait"
 msgstr "Por favor, espera"
 
 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
-#: ../../mod/photos.php:1448 ../../mod/content.php:688
-#: ../../include/conversation.php:598 ../../object/Item.php:529
+#: ../../mod/photos.php:1448 ../../mod/content.php:690
+#: ../../include/conversation.php:604 ../../object/Item.php:556
 msgid "This is you"
 msgstr "Este eres tú"
 
 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
-#: ../../mod/photos.php:1450 ../../mod/content.php:690
-#: ../../include/conversation.php:600 ../../boot.php:574
-#: ../../object/Item.php:531
+#: ../../mod/photos.php:1450 ../../mod/content.php:692
+#: ../../include/conversation.php:606 ../../boot.php:574
+#: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Comentar"
 
 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:610
-#: ../../include/conversation.php:1281 ../../object/Item.php:541
+#: ../../mod/content.php:702 ../../include/conversation.php:616
+#: ../../include/conversation.php:1305 ../../object/Item.php:568
 msgid "Preview"
 msgstr "Vista previa"
 
 #: ../../mod/photos.php:1479 ../../mod/content.php:439
-#: ../../mod/content.php:721 ../../mod/settings.php:606
-#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
-#: ../../include/conversation.php:440 ../../include/conversation.php:874
+#: ../../mod/content.php:723 ../../mod/settings.php:606
+#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696
+#: ../../include/conversation.php:448 ../../include/conversation.php:889
 #: ../../object/Item.php:116
 msgid "Delete"
 msgstr "Eliminar"
@@ -697,29 +697,29 @@ msgstr "Elemento no encontrado"
 msgid "Edit post"
 msgstr "Editar publicación"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1254
 msgid "Post to Email"
 msgstr "Publicar mediante correo electrónico"
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:708
-#: ../../mod/settings.php:605 ../../include/conversation.php:433
+#: ../../mod/editpost.php:103 ../../mod/content.php:710
+#: ../../mod/settings.php:605 ../../include/conversation.php:441
 #: ../../object/Item.php:107
 msgid "Edit"
 msgstr "Editar"
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1245
+#: ../../include/conversation.php:1269
 msgid "Upload photo"
 msgstr "Subir foto"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1271
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1249
+#: ../../include/conversation.php:1273
 msgid "Insert web link"
 msgstr "Insertar enlace"
 
@@ -735,35 +735,35 @@ msgstr "Insertar vídeo Vorbis [.ogg]"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Insertar audio Vorbis [.ogg]"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1279
 msgid "Set your location"
 msgstr "Configurar tu localización"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1281
 msgid "Clear browser location"
 msgstr "Borrar la localización del navegador"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1288
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1297
 msgid "CC: email addresses"
 msgstr "CC: dirección de correo electrónico"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1298
 msgid "Public post"
 msgstr "Publicación pública"
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1284
 msgid "Set title"
 msgstr "Establecer el título"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1286
 msgid "Categories (comma-separated list)"
 msgstr "Categorías (lista separada por comas)"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1300
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
 
@@ -1305,148 +1305,156 @@ msgstr "El grupo está vacío"
 msgid "Group: "
 msgstr "Grupo: "
 
-#: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:439 ../../include/conversation.php:873
+#: ../../mod/content.php:438 ../../mod/content.php:722
+#: ../../include/conversation.php:447 ../../include/conversation.php:888
 #: ../../object/Item.php:115
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:639
-#: ../../include/conversation.php:640 ../../include/conversation.php:890
-#: ../../object/Item.php:206 ../../object/Item.php:207
+#: ../../mod/content.php:455 ../../mod/content.php:815
+#: ../../mod/content.php:816 ../../include/conversation.php:654
+#: ../../include/conversation.php:655 ../../include/conversation.php:907
+#: ../../object/Item.php:226 ../../object/Item.php:227
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Ver perfil de %s @ %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:653 ../../include/conversation.php:904
-#: ../../object/Item.php:219
+#: ../../mod/content.php:465 ../../mod/content.php:827
+#: ../../include/conversation.php:668 ../../include/conversation.php:927
+#: ../../object/Item.php:239
 #, php-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:919
+#: ../../mod/content.php:480 ../../include/conversation.php:942
 msgid "View in context"
 msgstr "Verlo en contexto"
 
-#: ../../mod/content.php:586 ../../include/conversation.php:680
-#: ../../object/Item.php:256
+#: ../../mod/content.php:586 ../../include/conversation.php:695
+#: ../../object/Item.php:276
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentario"
 msgstr[1] "%d comentarios"
 
-#: ../../mod/content.php:587 ../../addon/page/page.php:76
+#: ../../mod/content.php:588 ../../include/text.php:1443
+#: ../../include/conversation.php:697 ../../object/Item.php:278
+#: ../../object/Item.php:291
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] "Comentario"
+
+#: ../../mod/content.php:589 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
-#: ../../boot.php:575 ../../object/Item.php:257
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:698
+#: ../../boot.php:575 ../../object/Item.php:279
 msgid "show more"
 msgstr "ver más"
 
-#: ../../mod/content.php:665 ../../include/conversation.php:575
-#: ../../object/Item.php:185
+#: ../../mod/content.php:667 ../../include/conversation.php:581
+#: ../../object/Item.php:195
 msgid "like"
 msgstr "me gusta"
 
-#: ../../mod/content.php:666 ../../include/conversation.php:576
-#: ../../object/Item.php:186
+#: ../../mod/content.php:668 ../../include/conversation.php:582
+#: ../../object/Item.php:196
 msgid "dislike"
 msgstr "no me gusta"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:578
-#: ../../object/Item.php:188
+#: ../../mod/content.php:670 ../../include/conversation.php:584
+#: ../../object/Item.php:198
 msgid "Share this"
 msgstr "Compartir esto"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:578
-#: ../../object/Item.php:188
+#: ../../mod/content.php:670 ../../include/conversation.php:584
+#: ../../object/Item.php:198
 msgid "share"
 msgstr "compartir"
 
-#: ../../mod/content.php:692 ../../include/conversation.php:602
-#: ../../object/Item.php:533
+#: ../../mod/content.php:694 ../../include/conversation.php:608
+#: ../../object/Item.php:560
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../mod/content.php:693 ../../include/conversation.php:603
-#: ../../object/Item.php:534
+#: ../../mod/content.php:695 ../../include/conversation.php:609
+#: ../../object/Item.php:561
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../../mod/content.php:694 ../../include/conversation.php:604
-#: ../../object/Item.php:535
+#: ../../mod/content.php:696 ../../include/conversation.php:610
+#: ../../object/Item.php:562
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../../mod/content.php:695 ../../include/conversation.php:605
-#: ../../object/Item.php:536
+#: ../../mod/content.php:697 ../../include/conversation.php:611
+#: ../../object/Item.php:563
 msgid "Quote"
 msgstr "Cita"
 
-#: ../../mod/content.php:696 ../../include/conversation.php:606
-#: ../../object/Item.php:537
+#: ../../mod/content.php:698 ../../include/conversation.php:612
+#: ../../object/Item.php:564
 msgid "Code"
 msgstr "Código"
 
-#: ../../mod/content.php:697 ../../include/conversation.php:607
-#: ../../object/Item.php:538
+#: ../../mod/content.php:699 ../../include/conversation.php:613
+#: ../../object/Item.php:565
 msgid "Image"
 msgstr "Imagen"
 
-#: ../../mod/content.php:698 ../../include/conversation.php:608
-#: ../../object/Item.php:539
+#: ../../mod/content.php:700 ../../include/conversation.php:614
+#: ../../object/Item.php:566
 msgid "Link"
 msgstr "Enlace"
 
-#: ../../mod/content.php:699 ../../include/conversation.php:609
-#: ../../object/Item.php:540
+#: ../../mod/content.php:701 ../../include/conversation.php:615
+#: ../../object/Item.php:567
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../../mod/content.php:733 ../../include/conversation.php:539
-#: ../../object/Item.php:169
+#: ../../mod/content.php:735 ../../include/conversation.php:545
+#: ../../object/Item.php:179
 msgid "add star"
 msgstr "Añadir estrella"
 
-#: ../../mod/content.php:734 ../../include/conversation.php:540
-#: ../../object/Item.php:170
+#: ../../mod/content.php:736 ../../include/conversation.php:546
+#: ../../object/Item.php:180
 msgid "remove star"
 msgstr "Quitar estrella"
 
-#: ../../mod/content.php:735 ../../include/conversation.php:541
-#: ../../object/Item.php:171
+#: ../../mod/content.php:737 ../../include/conversation.php:547
+#: ../../object/Item.php:181
 msgid "toggle star status"
 msgstr "Añadir a destacados"
 
-#: ../../mod/content.php:738 ../../include/conversation.php:544
-#: ../../object/Item.php:174
+#: ../../mod/content.php:740 ../../include/conversation.php:550
+#: ../../object/Item.php:184
 msgid "starred"
 msgstr "marcados con estrellas"
 
-#: ../../mod/content.php:739 ../../include/conversation.php:545
-#: ../../object/Item.php:175
+#: ../../mod/content.php:741 ../../include/conversation.php:551
+#: ../../object/Item.php:185
 msgid "add tag"
 msgstr "añadir etiqueta"
 
-#: ../../mod/content.php:743 ../../include/conversation.php:443
+#: ../../mod/content.php:745 ../../include/conversation.php:451
 #: ../../object/Item.php:119
 msgid "save to folder"
 msgstr "grabado en directorio"
 
-#: ../../mod/content.php:815 ../../include/conversation.php:641
-#: ../../object/Item.php:208
+#: ../../mod/content.php:817 ../../include/conversation.php:656
+#: ../../object/Item.php:228
 msgid "to"
 msgstr "a"
 
-#: ../../mod/content.php:816 ../../include/conversation.php:642
-#: ../../object/Item.php:209
+#: ../../mod/content.php:818 ../../include/conversation.php:657
+#: ../../object/Item.php:229
 msgid "Wall-to-Wall"
 msgstr "Muro-A-Muro"
 
-#: ../../mod/content.php:817 ../../include/conversation.php:643
-#: ../../object/Item.php:210
+#: ../../mod/content.php:819 ../../include/conversation.php:658
+#: ../../object/Item.php:230
 msgid "via Wall-To-Wall:"
 msgstr "via Muro-A-Muro:"
 
@@ -1531,7 +1539,7 @@ msgid "if applicable"
 msgstr "Si corresponde"
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:694
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -1732,12 +1740,12 @@ msgid "View all contacts"
 msgstr "Ver todos los contactos"
 
 #: ../../mod/contacts.php:315 ../../mod/contacts.php:374
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:698
 msgid "Unblock"
 msgstr "Desbloquear"
 
 #: ../../mod/contacts.php:315 ../../mod/contacts.php:374
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:697
 msgid "Block"
 msgstr "Bloquear"
 
@@ -1834,7 +1842,7 @@ msgstr "Última actualización:"
 msgid "Update public posts"
 msgstr "Actualizar publicaciones públicas"
 
-#: ../../mod/contacts.php:371 ../../mod/admin.php:1167
+#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
 msgid "Update now"
 msgstr "Actualizar ahora"
 
@@ -2048,7 +2056,7 @@ msgid "Remove account"
 msgstr "Eliminar cuenta"
 
 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:782 ../../mod/admin.php:987
+#: ../../mod/admin.php:785 ../../mod/admin.php:990
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
@@ -2697,7 +2705,7 @@ msgstr "Sin receptor."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
+#: ../../include/conversation.php:1205 ../../include/conversation.php:1222
 msgid "Please enter a link URL:"
 msgstr "Introduce la dirección del enlace:"
 
@@ -3058,38 +3066,38 @@ msgstr "Tu OpenID (opcional):"
 msgid "Include your profile in member directory?"
 msgstr "¿Incluir tu perfil en el directorio de miembros?"
 
-#: ../../mod/register.php:253
+#: ../../mod/register.php:255
 msgid "Membership on this site is by invitation only."
 msgstr "Sitio solo accesible mediante invitación."
 
-#: ../../mod/register.php:254
+#: ../../mod/register.php:256
 msgid "Your invitation ID: "
 msgstr "ID de tu invitación: "
 
-#: ../../mod/register.php:257 ../../mod/admin.php:444
+#: ../../mod/register.php:259 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Registro"
 
-#: ../../mod/register.php:265
+#: ../../mod/register.php:267
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Tu nombre completo (por ejemplo, Manuel Pérez): "
 
-#: ../../mod/register.php:266
+#: ../../mod/register.php:268
 msgid "Your Email Address: "
 msgstr "Tu dirección de correo: "
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:269
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@$nombredelsitio</strong>\"."
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:270
 msgid "Choose a nickname: "
 msgstr "Escoge un apodo: "
 
-#: ../../mod/register.php:271 ../../include/nav.php:81 ../../boot.php:887
+#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887
 msgid "Register"
 msgstr "Registrarse"
 
@@ -3098,31 +3106,31 @@ msgid "People Search"
 msgstr "Buscar personas"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62
-#: ../../addon/facebook/facebook.php:1594
+#: ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
-#: ../../include/conversation.php:250 ../../include/conversation.php:259
+#: ../../include/conversation.php:248 ../../include/conversation.php:257
 msgid "status"
 msgstr "estado"
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
-#: ../../include/conversation.php:137
+#: ../../include/conversation.php:136
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: ../../mod/like.php:164 ../../include/conversation.php:140
+#: ../../mod/like.php:164 ../../include/conversation.php:139
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:731 ../../mod/admin.php:930 ../../mod/display.php:29
+#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
 #: ../../mod/display.php:145 ../../include/items.php:3774
 msgid "Item not found."
 msgstr "Elemento no encontrado."
@@ -3194,7 +3202,7 @@ msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no de
 msgid "%s posted an update."
 msgstr "%s ha publicado una actualización."
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:228
+#: ../../mod/mood.php:62 ../../include/conversation.php:226
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr "%1$s está actualmente %2$s"
@@ -3372,15 +3380,15 @@ msgstr "Configuración de la apariencia actualizada."
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:686 ../../mod/admin.php:698
+#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:780 ../../mod/admin.php:822
+#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
 msgid "Plugins"
 msgstr "Módulos"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:985 ../../mod/admin.php:1021
+#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
 msgid "Themes"
 msgstr "Temas"
 
@@ -3388,7 +3396,7 @@ msgstr "Temas"
 msgid "DB updates"
 msgstr "Actualizaciones de la Base de Datos"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1108
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
 msgid "Logs"
 msgstr "Registros"
 
@@ -3404,19 +3412,19 @@ msgstr "Características del módulo"
 msgid "User registrations waiting for confirmation"
 msgstr "Registro de usuarios esperando la confirmación"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:668
+#: ../../mod/admin.php:183 ../../mod/admin.php:669
 msgid "Normal Account"
 msgstr "Cuenta normal"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:669
+#: ../../mod/admin.php:184 ../../mod/admin.php:670
 msgid "Soapbox Account"
 msgstr "Cuenta tribuna"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:670
+#: ../../mod/admin.php:185 ../../mod/admin.php:671
 msgid "Community/Celebrity Account"
 msgstr "Cuenta de Comunidad/Celebridad"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:671
+#: ../../mod/admin.php:186 ../../mod/admin.php:672
 msgid "Automatic Friend Account"
 msgstr "Cuenta de amistad automática"
 
@@ -3432,9 +3440,9 @@ msgstr "Foro privado"
 msgid "Message queues"
 msgstr "Cola de mensajes"
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:685
-#: ../../mod/admin.php:779 ../../mod/admin.php:821 ../../mod/admin.php:984
-#: ../../mod/admin.php:1020 ../../mod/admin.php:1107
+#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
+#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
+#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
 msgid "Administration"
 msgstr "Administración"
 
@@ -3859,148 +3867,152 @@ msgstr "Usuario '%s' desbloqueado"
 msgid "User '%s' blocked"
 msgstr "Usuario '%s' bloqueado'"
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:690
 msgid "select all"
 msgstr "seleccionar todo"
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:691
 msgid "User registrations waiting for confirm"
 msgstr "Registro de usuarios esperando confirmación"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:692
 msgid "Request date"
 msgstr "Solicitud de fecha"
 
-#: ../../mod/admin.php:690 ../../mod/admin.php:699
+#: ../../mod/admin.php:692 ../../mod/admin.php:702
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:693
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:695
 msgid "Deny"
 msgstr "Denegado"
 
 #: ../../mod/admin.php:699
+msgid "Site admin"
+msgstr ""
+
+#: ../../mod/admin.php:702
 msgid "Register date"
 msgstr "Fecha de registro"
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Last login"
 msgstr "Último acceso"
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Last item"
 msgstr "Último elemento"
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../../mod/admin.php:701
+#: ../../mod/admin.php:704
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
 
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:746
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Módulo %s deshabilitado."
 
-#: ../../mod/admin.php:747
+#: ../../mod/admin.php:750
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Módulo %s habilitado."
 
-#: ../../mod/admin.php:757 ../../mod/admin.php:955
+#: ../../mod/admin.php:760 ../../mod/admin.php:958
 msgid "Disable"
 msgstr "Desactivado"
 
-#: ../../mod/admin.php:759 ../../mod/admin.php:957
+#: ../../mod/admin.php:762 ../../mod/admin.php:960
 msgid "Enable"
 msgstr "Activado"
 
-#: ../../mod/admin.php:781 ../../mod/admin.php:986
+#: ../../mod/admin.php:784 ../../mod/admin.php:989
 msgid "Toggle"
 msgstr "Activar"
 
-#: ../../mod/admin.php:789 ../../mod/admin.php:996
+#: ../../mod/admin.php:792 ../../mod/admin.php:999
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:790 ../../mod/admin.php:997
+#: ../../mod/admin.php:793 ../../mod/admin.php:1000
 msgid "Maintainer: "
 msgstr "Mantenedor: "
 
-#: ../../mod/admin.php:919
+#: ../../mod/admin.php:922
 msgid "No themes found."
 msgstr "No se encontraron temas."
 
-#: ../../mod/admin.php:978
+#: ../../mod/admin.php:981
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../../mod/admin.php:1026
+#: ../../mod/admin.php:1029
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../mod/admin.php:1027
+#: ../../mod/admin.php:1030
 msgid "[Unsupported]"
 msgstr "[Sin soporte]"
 
-#: ../../mod/admin.php:1054
+#: ../../mod/admin.php:1057
 msgid "Log settings updated."
 msgstr "Configuración de registro actualizada."
 
-#: ../../mod/admin.php:1110
+#: ../../mod/admin.php:1113
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1119
 msgid "Debugging"
 msgstr "Depuración"
 
-#: ../../mod/admin.php:1117
+#: ../../mod/admin.php:1120
 msgid "Log file"
 msgstr "Archivo de registro"
 
-#: ../../mod/admin.php:1117
+#: ../../mod/admin.php:1120
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica."
 
-#: ../../mod/admin.php:1118
+#: ../../mod/admin.php:1121
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: ../../mod/admin.php:1168
+#: ../../mod/admin.php:1171
 msgid "Close"
 msgstr "Cerrado"
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1177
 msgid "FTP Host"
 msgstr "Hospedaje FTP"
 
-#: ../../mod/admin.php:1175
+#: ../../mod/admin.php:1178
 msgid "FTP Path"
 msgstr "Ruta FTP"
 
-#: ../../mod/admin.php:1176
+#: ../../mod/admin.php:1179
 msgid "FTP User"
 msgstr "Usuario FTP"
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1180
 msgid "FTP Password"
 msgstr "Contraseña FTP"
 
@@ -4016,48 +4028,48 @@ msgstr "El acceso a este perfil ha sido restringido."
 msgid "Tips for New Members"
 msgstr "Consejos para nuevos miembros"
 
-#: ../../mod/ping.php:185
+#: ../../mod/ping.php:235
 msgid "{0} wants to be your friend"
 msgstr "{0} quiere ser tu amigo"
 
-#: ../../mod/ping.php:190
+#: ../../mod/ping.php:240
 msgid "{0} sent you a message"
 msgstr "{0} te ha enviado un mensaje"
 
-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:245
 msgid "{0} requested registration"
 msgstr "{0} solicitudes de registro"
 
-#: ../../mod/ping.php:201
+#: ../../mod/ping.php:251
 #, php-format
 msgid "{0} commented %s's post"
 msgstr "{0} comentó la publicación de %s"
 
-#: ../../mod/ping.php:206
+#: ../../mod/ping.php:256
 #, php-format
 msgid "{0} liked %s's post"
 msgstr "A {0} le ha gustado la publicación de %s"
 
-#: ../../mod/ping.php:211
+#: ../../mod/ping.php:261
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr "A {0} no le ha gustado la publicación de %s"
 
-#: ../../mod/ping.php:216
+#: ../../mod/ping.php:266
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr "{0} ahora es amigo de %s"
 
-#: ../../mod/ping.php:221
+#: ../../mod/ping.php:271
 msgid "{0} posted"
 msgstr "{0} publicado"
 
-#: ../../mod/ping.php:226
+#: ../../mod/ping.php:276
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr "{0} etiquetó la publicación de %s como #%s"
 
-#: ../../mod/ping.php:232
+#: ../../mod/ping.php:282
 msgid "{0} mentioned you in a post"
 msgstr "{0} te mencionó en una publicación"
 
@@ -4419,8 +4431,8 @@ msgstr "Visible para todos"
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1185
-#: ../../include/conversation.php:1202
+#: ../../mod/filer.php:29 ../../include/conversation.php:1209
+#: ../../include/conversation.php:1226
 msgid "Save to Folder:"
 msgstr "Guardar en directorio:"
 
@@ -4428,7 +4440,7 @@ msgstr "Guardar en directorio:"
 msgid "- select -"
 msgstr "- seleccionar -"
 
-#: ../../mod/tagger.php:95 ../../include/conversation.php:267
+#: ../../mod/tagger.php:95 ../../include/conversation.php:265
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
@@ -4686,7 +4698,7 @@ msgid "Unable to set contact photo."
 msgstr "Imposible establecer la foto del contacto."
 
 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
-#: ../../include/conversation.php:173
+#: ../../include/conversation.php:171
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s ahora es amigo de %2$s"
@@ -5247,11 +5259,11 @@ msgstr "Contraseña de Livejournal"
 msgid "Post to LiveJournal by default"
 msgstr "Publicar en Livejournal por defecto"
 
-#: ../../addon/nsfw/nsfw.php:47
+#: ../../addon/nsfw/nsfw.php:78
 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr "Configuración \"Not Safe For Work\" (Filtro de contenido de carácter general)"
 
-#: ../../addon/nsfw/nsfw.php:49
+#: ../../addon/nsfw/nsfw.php:80
 msgid ""
 "This plugin looks in posts for the words/text you specify below, and "
 "collapses any content containing those keywords so it is not displayed at "
@@ -5261,23 +5273,23 @@ msgid ""
 " can thereby be used as a general purpose content filter."
 msgstr "Este complemento busca las palabras clave que especifiques y oculta cualquier comentario que contenga dichas claves, para que no aparezcan en momentos inoportunos, como por ejemplo, material sexual. Se considera de buena educación y correcto etiquetar los desnudos con #NSFW.  Este filtro puede servir para filtrar otro contenido, así que te puede servir como un filtro de carácter general, escogiendo las palabras clave adecuadas."
 
-#: ../../addon/nsfw/nsfw.php:50
+#: ../../addon/nsfw/nsfw.php:81
 msgid "Enable Content filter"
 msgstr "Activar el filtro de contenido"
 
-#: ../../addon/nsfw/nsfw.php:53
+#: ../../addon/nsfw/nsfw.php:84
 msgid "Comma separated list of keywords to hide"
 msgstr "Palabras clave para ocultar, lista separada por comas"
 
-#: ../../addon/nsfw/nsfw.php:58
+#: ../../addon/nsfw/nsfw.php:89
 msgid "Use /expression/ to provide regular expressions"
 msgstr "Usa /expresión/ para proporcionar expresiones regulares"
 
-#: ../../addon/nsfw/nsfw.php:74
+#: ../../addon/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
 msgstr "Configuración NSFW guardada."
 
-#: ../../addon/nsfw/nsfw.php:121
+#: ../../addon/nsfw/nsfw.php:157
 #, php-format
 msgid "%s - Click to open/close"
 msgstr "%s - Pulsa aquí para abrir/cerrar"
@@ -5351,8 +5363,8 @@ msgid "Latest likes"
 msgstr "Últimos me gusta"
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
-#: ../../include/conversation.php:117 ../../include/conversation.php:247
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1437
+#: ../../include/conversation.php:117 ../../include/conversation.php:245
 msgid "event"
 msgstr "evento"
 
@@ -6945,6 +6957,23 @@ msgstr "Sala de Chat IRC"
 msgid "Popular Channels"
 msgstr "Canales populares"
 
+#: ../../addon/fromapp/fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr ""
+
+#: ../../addon/fromapp/fromapp.php:64
+msgid "FromApp Settings"
+msgstr ""
+
+#: ../../addon/fromapp/fromapp.php:66
+msgid ""
+"The application name you would like to show your posts originating from."
+msgstr ""
+
+#: ../../addon/fromapp/fromapp.php:70
+msgid "Use this application name even if another application was used."
+msgstr ""
+
 #: ../../addon/blogger/blogger.php:42
 msgid "Post to blogger"
 msgstr "Publícar en Blogger"
@@ -7630,7 +7659,7 @@ msgstr[1] "%d Contactos"
 msgid "poke"
 msgstr "tocar"
 
-#: ../../include/text.php:719 ../../include/conversation.php:212
+#: ../../include/text.php:719 ../../include/conversation.php:210
 msgid "poked"
 msgstr "tocó a"
 
@@ -7806,47 +7835,27 @@ msgstr "Diciembre"
 msgid "bytes"
 msgstr "bytes"
 
-#: ../../include/text.php:1027 ../../include/text.php:1042
-msgid "remove"
-msgstr "eliminar"
-
-#: ../../include/text.php:1027 ../../include/text.php:1042
-msgid "[remove]"
-msgstr "[eliminar]"
-
-#: ../../include/text.php:1030
-msgid "Categories:"
-msgstr "Categorías:"
-
-#: ../../include/text.php:1045
-msgid "Filed under:"
-msgstr "Archivado en:"
-
-#: ../../include/text.php:1061 ../../include/text.php:1073
+#: ../../include/text.php:1034 ../../include/text.php:1046
 msgid "Click to open/close"
 msgstr "Pulsa para abrir/cerrar"
 
-#: ../../include/text.php:1179 ../../include/user.php:236
+#: ../../include/text.php:1219 ../../include/user.php:236
 msgid "default"
 msgstr "predeterminado"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1231
 msgid "Select an alternate language"
 msgstr "Elige otro idioma"
 
-#: ../../include/text.php:1401
+#: ../../include/text.php:1441
 msgid "activity"
 msgstr "Actividad"
 
-#: ../../include/text.php:1403
-msgid "comment"
-msgstr "Comentario"
-
-#: ../../include/text.php:1404
+#: ../../include/text.php:1444
 msgid "post"
 msgstr "Publicación"
 
-#: ../../include/text.php:1559
+#: ../../include/text.php:1599
 msgid "Item filed"
 msgstr "Elemento archivado"
 
@@ -7854,7 +7863,7 @@ msgstr "Elemento archivado"
 msgid "Sharing notification from Diaspora network"
 msgstr "Compartir notificaciones con la red Diaspora*"
 
-#: ../../include/diaspora.php:2202
+#: ../../include/diaspora.php:2211
 msgid "Attachments:"
 msgstr "Archivos adjuntos:"
 
@@ -8521,163 +8530,177 @@ msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por habe
 msgid "stopped following"
 msgstr "dejó de seguir"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1082
+#: ../../include/Contact.php:220 ../../include/conversation.php:1106
 msgid "Poke"
 msgstr "Toque"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1076
+#: ../../include/Contact.php:221 ../../include/conversation.php:1100
 msgid "View Status"
 msgstr "Ver estado"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1077
+#: ../../include/Contact.php:222 ../../include/conversation.php:1101
 msgid "View Profile"
 msgstr "Ver perfil"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1078
+#: ../../include/Contact.php:223 ../../include/conversation.php:1102
 msgid "View Photos"
 msgstr "Ver fotos"
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1103
 msgid "Network Posts"
 msgstr "Publicaciones en la red"
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1104
 msgid "Edit Contact"
 msgstr "Editar contacto"
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1081
+#: ../../include/conversation.php:1105
 msgid "Send PM"
 msgstr "Enviar mensaje privado"
 
-#: ../../include/conversation.php:208
+#: ../../include/conversation.php:206
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s le dio un toque a %2$s"
 
-#: ../../include/conversation.php:292
+#: ../../include/conversation.php:290
 msgid "post/item"
 msgstr "publicación/tema"
 
-#: ../../include/conversation.php:293
+#: ../../include/conversation.php:291
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
 
-#: ../../include/conversation.php:982
+#: ../../include/conversation.php:645 ../../include/conversation.php:919
+#: ../../object/Item.php:217
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:646 ../../include/conversation.php:920
+#: ../../object/Item.php:218
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:1002
+msgid "remove"
+msgstr "eliminar"
+
+#: ../../include/conversation.php:1006
 msgid "Delete Selected Items"
 msgstr "Eliminar el elemento seleccionado"
 
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1164
 #, php-format
 msgid "%s likes this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1164
 #, php-format
 msgid "%s doesn't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1168
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "Le gusta a <span %1$s>%2$d personas</span>."
 
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1170
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "No le gusta a <span %1$s>%2$d personas</span>."
 
-#: ../../include/conversation.php:1152
+#: ../../include/conversation.php:1176
 msgid "and"
 msgstr "y"
 
-#: ../../include/conversation.php:1155
+#: ../../include/conversation.php:1179
 #, php-format
 msgid ", and %d other people"
 msgstr " y a otras %d personas"
 
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1180
 #, php-format
 msgid "%s like this."
 msgstr "Le gusta a %s."
 
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1180
 #, php-format
 msgid "%s don't like this."
 msgstr "No le gusta a %s."
 
-#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
+#: ../../include/conversation.php:1204 ../../include/conversation.php:1221
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visible para <strong>cualquiera</strong>"
 
-#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
+#: ../../include/conversation.php:1206 ../../include/conversation.php:1223
 msgid "Please enter a video link/URL:"
 msgstr "Por favor, introduce la URL/enlace del vídeo:"
 
-#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
+#: ../../include/conversation.php:1207 ../../include/conversation.php:1224
 msgid "Please enter an audio link/URL:"
 msgstr "Por favor, introduce la URL/enlace del audio:"
 
-#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
+#: ../../include/conversation.php:1208 ../../include/conversation.php:1225
 msgid "Tag term:"
 msgstr "Etiquetar:"
 
-#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
+#: ../../include/conversation.php:1210 ../../include/conversation.php:1227
 msgid "Where are you right now?"
 msgstr "¿Dónde estás ahora?"
 
-#: ../../include/conversation.php:1246
+#: ../../include/conversation.php:1270
 msgid "upload photo"
 msgstr "subir imagen"
 
-#: ../../include/conversation.php:1248
+#: ../../include/conversation.php:1272
 msgid "attach file"
 msgstr "adjuntar archivo"
 
-#: ../../include/conversation.php:1250
+#: ../../include/conversation.php:1274
 msgid "web link"
 msgstr "enlace web"
 
-#: ../../include/conversation.php:1251
+#: ../../include/conversation.php:1275
 msgid "Insert video link"
 msgstr "Insertar enlace del vídeo"
 
-#: ../../include/conversation.php:1252
+#: ../../include/conversation.php:1276
 msgid "video link"
 msgstr "enlace de video"
 
-#: ../../include/conversation.php:1253
+#: ../../include/conversation.php:1277
 msgid "Insert audio link"
 msgstr "Insertar vínculo del audio"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1278
 msgid "audio link"
 msgstr "enlace de audio"
 
-#: ../../include/conversation.php:1256
+#: ../../include/conversation.php:1280
 msgid "set location"
 msgstr "establecer tu ubicación"
 
-#: ../../include/conversation.php:1258
+#: ../../include/conversation.php:1282
 msgid "clear location"
 msgstr "limpiar la localización"
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1289
 msgid "permissions"
 msgstr "permisos"
 
-#: ../../include/plugin.php:400 ../../include/plugin.php:402
+#: ../../include/plugin.php:389 ../../include/plugin.php:391
 msgid "Click here to upgrade."
 msgstr "Pulsa aquí para actualizar."
 
-#: ../../include/plugin.php:408
+#: ../../include/plugin.php:397
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Esta acción excede los límites permitidos por tu subscripción."
 
-#: ../../include/plugin.php:413
+#: ../../include/plugin.php:402
 msgid "This action is not available under your subscription plan."
 msgstr "Esta acción no está permitida para tu subscripción."
 
diff --git a/view/es/strings.php b/view/es/strings.php
index 5dd15fb6f7..e8c617086c 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -277,6 +277,10 @@ $a->strings["%d comment"] = array(
 	0 => "%d comentario",
 	1 => "%d comentarios",
 );
+$a->strings["comment"] = array(
+	0 => "",
+	1 => "Comentario",
+);
 $a->strings["show more"] = "ver más";
 $a->strings["like"] = "me gusta";
 $a->strings["dislike"] = "no me gusta";
@@ -860,6 +864,7 @@ $a->strings["Request date"] = "Solicitud de fecha";
 $a->strings["Email"] = "Correo electrónico";
 $a->strings["No registrations."] = "Sin registros.";
 $a->strings["Deny"] = "Denegado";
+$a->strings["Site admin"] = "";
 $a->strings["Register date"] = "Fecha de registro";
 $a->strings["Last login"] = "Último acceso";
 $a->strings["Last item"] = "Último elemento";
@@ -1564,6 +1569,10 @@ $a->strings["Popular Channels (comma separated)"] = "Canales populares (separado
 $a->strings["IRC settings saved."] = "Configuración de IRC guardada.";
 $a->strings["IRC Chatroom"] = "Sala de Chat IRC";
 $a->strings["Popular Channels"] = "Canales populares";
+$a->strings["Fromapp settings updated."] = "";
+$a->strings["FromApp Settings"] = "";
+$a->strings["The application name you would like to show your posts originating from."] = "";
+$a->strings["Use this application name even if another application was used."] = "";
 $a->strings["Post to blogger"] = "Publícar en Blogger";
 $a->strings["Blogger Post Settings"] = "Configuración de las publicaciones en Blogger";
 $a->strings["Enable Blogger Post Plugin"] = "Activar el módulo de publicación en Blogger";
@@ -1769,15 +1778,10 @@ $a->strings["October"] = "Octubre";
 $a->strings["November"] = "Noviembre";
 $a->strings["December"] = "Diciembre";
 $a->strings["bytes"] = "bytes";
-$a->strings["remove"] = "eliminar";
-$a->strings["[remove]"] = "[eliminar]";
-$a->strings["Categories:"] = "Categorías:";
-$a->strings["Filed under:"] = "Archivado en:";
 $a->strings["Click to open/close"] = "Pulsa para abrir/cerrar";
 $a->strings["default"] = "predeterminado";
 $a->strings["Select an alternate language"] = "Elige otro idioma";
 $a->strings["activity"] = "Actividad";
-$a->strings["comment"] = "Comentario";
 $a->strings["post"] = "Publicación";
 $a->strings["Item filed"] = "Elemento archivado";
 $a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
@@ -1946,6 +1950,9 @@ $a->strings["Send PM"] = "Enviar mensaje privado";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s le dio un toque a %2\$s";
 $a->strings["post/item"] = "publicación/tema";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s ha marcado %3\$s de %2\$s como Favorito";
+$a->strings["Categories:"] = "";
+$a->strings["Filed under:"] = "";
+$a->strings["remove"] = "eliminar";
 $a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado";
 $a->strings["%s likes this."] = "A %s le gusta esto.";
 $a->strings["%s doesn't like this."] = "A %s no le gusta esto.";