diff --git a/locale/es/LC_MESSAGES/laconica.mo b/locale/es/LC_MESSAGES/laconica.mo
index 5fa91b6654..fa655909f2 100644
Binary files a/locale/es/LC_MESSAGES/laconica.mo and b/locale/es/LC_MESSAGES/laconica.mo differ
diff --git a/locale/es/LC_MESSAGES/laconica.po b/locale/es/LC_MESSAGES/laconica.po
index 72055348b6..4cc5a07194 100644
--- a/locale/es/LC_MESSAGES/laconica.po
+++ b/locale/es/LC_MESSAGES/laconica.po
@@ -6,9 +6,20 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,64 +32,20 @@ msgstr ""
 msgid " Search Stream for \"%s\""
 msgstr "Busca \"%s\" en el Corriente"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 "excepto los siguientes datos privados: contraseña, dirección de correo "
 "electrónico, dirección de mensajería instantánea, número de teléfono."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ahora está escuchando tus avisos en %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -95,159 +62,73 @@ msgstr ""
 "Atentamente,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flujo público de %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s y amigos"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Línea temporal pública"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "estado de %1$s en %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Línea temporal pública"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:257
+#: ../lib/util.php:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
-"site.broughtbyurl%%)."
+"**%%site.name%%** es un servicio de microblogueo de "
+"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** es un servicio de microblogueo."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Los colaboradores deben ser citados por su nombre completo o apodo."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
+"1-64 letras en minúscula o números, sin signos de puntuación o "
+"espacios"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 o más caracteres"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 "Un código de confirmación fue enviado a la dirección de mensajería "
 "instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
 "mensajes."
 
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un código de confirmación fue enviado a la dirección de mensajería "
-"instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
-"mensajes."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un código de confirmación fue enviado a la dirección de mensajería "
-"instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
-"mensajes."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Acerca de"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Añadir"
 
@@ -255,25 +136,15 @@ msgstr "Añadir"
 msgid "Add OpenID"
 msgstr "Añadir OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Eliminar OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Dirección"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas las actualizaciones para %s"
@@ -283,35 +154,26 @@ msgstr "Todas las actualizaciones para %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "¡Ya está suscrito!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -326,52 +188,31 @@ msgid ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
-"de amigos?)"
+"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu "
+"lista de amigos?)"
 
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
-"de amigos?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Antes"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografía"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "No se pudo eliminar la confirmación de correo electrónico."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No se puede leer el URL del avatar '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -379,79 +220,35 @@ msgstr "Cancelar"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Imposible crear una instancia del objeto OpenID."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "No se puede normalizar este Jabber ID"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Cambiar contraseña"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Configuración del perfil"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Confirmar la dirección"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Confirmación cancelada."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Ningún código de confirmación."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Código de confirmación no encontrado."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Conectarse"
@@ -460,7 +257,7 @@ msgstr "Conectarse"
 msgid "Connect existing account"
 msgstr "Conectarse a una cuenta existente"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
@@ -469,66 +266,44 @@ msgstr "Ponerse en contacto"
 msgid "Could not create OpenID form: %s"
 msgstr "No se pudo crear el formulario OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No se pudo redirigir al servidor: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "No se pudo guardar la información del avatar"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "No se pudo guardar la información del nuevo perfil"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "¡No estás suscrito!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "No se pudo insertar el código de confirmación."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "No se pudo confirmar el correo electrónico."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "No se pudieron convertir las señales de petición a señales de acceso."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "No se pudo crear la suscripción."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "No se pudo actualizar el usuario."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "No se pudo obtener la señal de petición."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "No se pudo insertar el código de confirmación."
 
@@ -536,24 +311,12 @@ msgstr "No se pudo insertar el código de confirmación."
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "No se pudo guardar el perfil."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "No se pudo actualizar el usuario."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "No se pudo actualizar el usuario."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "No se pudo actualizar el usuario."
 
@@ -577,83 +340,44 @@ msgstr "Crear nueva cuenta para un OpenID que ya tiene un usuario."
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Dirección actual Jabber/Gtalk confirmada."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Dirección actual Jabber/Gtalk confirmada."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Actualmente"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Error de BD al insertar respuesta: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD al insertar respuesta: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nuevo aviso"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Configuración"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Confirmacion de correo electronico"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Dirección de correo electrónico"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Ingresa un apodo o correo electronico"
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Error al autorizar señal"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Error al conectar tu usuario a OpenID"
 
@@ -669,19 +393,23 @@ msgstr "Error al insertar el avatar"
 msgid "Error inserting new profile"
 msgstr "Error al insertar el nuevo perfil"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Error al insertar aviso"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Error al insertar perfil remoto"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Error al guardar confirmación de la dirección."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Error al guardar perfil remoto"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Error al guardar el perfil."
 
@@ -693,8 +421,8 @@ msgstr "Error al guardar el usuario."
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -706,7 +434,7 @@ msgstr "Error al actualizar el perfil"
 msgid "Error updating remote profile"
 msgstr "Error al actualizar el perfil remoto"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Error con el código de confirmación."
 
@@ -714,7 +442,7 @@ msgstr "Error con el código de confirmación."
 msgid "Existing nickname"
 msgstr "Apodo existente"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
@@ -722,30 +450,17 @@ msgstr "Preguntas Frecuentes"
 msgid "Failed updating avatar."
 msgstr "Error al actualizar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed de los amigos de %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed de respuestas a %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed de respuestas a %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -753,40 +468,31 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Portada"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "La página personal no es un URL válido."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Dirección de mensajería instantánea"
 
@@ -810,33 +516,23 @@ msgstr ""
 "Si quieres agregar una cuenta OpenID, ponla en el campo de abajo y haz clic "
 "en \"Añadir\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"If you've forgotten or lost your password, you can get a new one sent  the "
 "email address you have stored  in your account."
 msgstr ""
 "Si olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
 "dirección de correo electrónico que usaste para registrar tu cuenta."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "La dirección fue eliminada."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -844,22 +540,17 @@ msgstr ""
 "Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
 "correo registrada."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "El URL del avatar '%s' es inválido"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Correo electrónico no válido"
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "El sitio '%s' es inválido"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "El URL de la licencia '%s' es inválido"
@@ -876,7 +567,7 @@ msgstr "El URI del aviso es inválido"
 msgid "Invalid notice url"
 msgstr "El URL del aviso es inválido"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "El URL del perfil '%s' es inválido"
@@ -893,43 +584,27 @@ msgstr "URL del perfil devuelto por el servidor inválido."
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, php-format
 msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
+"%s, available under the [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Usa el software de microblogueo [Laconica](http://laconi.ca), versión %s, "
-"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"disponible bajo la [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -939,26 +614,16 @@ msgstr ""
 "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
 "mensajería instantánea o en GTalk."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -967,39 +632,26 @@ msgstr "Inicio de sesión"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicio de sesión con una cuenta [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, php-format
 msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea]"
-"(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
-"openidlogin%%). "
+"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? "
+"[Crea](%%action.register%%) una cuenta nueva o prueba [OpenID] "
+"(%%action.openidlogin%%). "
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Salir"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Miembro desde"
 
@@ -1008,59 +660,38 @@ msgstr "Miembro desde"
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Mi texto y archivos están disponibles bajo"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Correo electrónico no válido"
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nuevo apodo"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nuevo aviso"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Apodo"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "El apodo ya existe. Prueba otro."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El apodo debe tener solamente letras minúsculas y números y no puede tener "
@@ -1074,53 +705,30 @@ msgstr "Apodo prohibido."
 msgid "Nickname of the user you want to follow"
 msgstr "Apodo del usuario que quieres seguir"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Apodo o correo electrónico"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Ningún Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "¡Ningún contenido!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Ningún código de confirmación."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Dirección de correo electrónico"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Ningún identificador."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Correo electrónico no válido"
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Ningún apodo devuelto por el servidor remoto."
@@ -1129,25 +737,19 @@ msgstr "Ningún apodo devuelto por el servidor remoto."
 msgid "No nickname."
 msgstr "Ningún apodo."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "No existe ese usuario."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Ningun URL de perfil devuelto por el servidor."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "¡Ninguna petición encontrada!"
 
@@ -1159,14 +761,6 @@ msgstr "Ningún resultado"
 msgid "No size."
 msgstr "Ningún tamaño."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "No existe esa cuenta OpenID."
@@ -1175,8 +769,7 @@ msgstr "No existe esa cuenta OpenID."
 msgid "No such document."
 msgstr "No existe ese documento."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
@@ -1189,21 +782,16 @@ msgid "No such subscription"
 msgstr "No existe esa suscripción"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "No existe ese usuario."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "¡Nadie a mostrar!"
 
@@ -1211,44 +799,31 @@ msgstr "¡Nadie a mostrar!"
 msgid "Not a recovery code."
 msgstr "No es un código de recuperación."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "No es un código de recuperación."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Formato de imagen no soportado."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no válido"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 #, fuzzy
 msgid "Not a valid OpenID."
-msgstr "La cuenta OpenID no es válida"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"La cuenta OpenID no es válida\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Correo electrónico no válido"
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Apodo no válido"
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "URL de perfil no válido (servicios incorrectos)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "URL de perfil no válido (XRDS no definido)."
 
@@ -1268,27 +843,16 @@ msgstr "No autorizado."
 msgid "Not expecting this response!"
 msgstr "¡Respuesta inesperada!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "¡Ninguna petición encontrada!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "No conectado."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "¡No estás suscrito!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Buscar"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1298,20 +862,15 @@ msgstr "Feed de avisos de %s"
 msgid "Notice has no profile"
 msgstr "Aviso sin perfil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Feed de avisos de %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "Cuenta OpenID"
 
@@ -1354,69 +913,44 @@ msgstr "OpenID eliminado."
 msgid "OpenID settings"
 msgstr "Configuración OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Contraseña guardada"
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Buscador de gente"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Buscador de gente"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Buscador de gente"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Personal"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
@@ -1426,34 +960,27 @@ msgstr ""
 "avisos de este usuario. Si no pediste esta suscripción, haz clic en "
 "\"Cancelar\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Preferencias"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Perfil"
 
@@ -1465,10 +992,14 @@ msgstr "URL del perfil"
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Perfil desconocido"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Público"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Feed del flujo público"
@@ -1477,25 +1008,11 @@ msgstr "Feed del flujo público"
 msgid "Public timeline"
 msgstr "Línea temporal pública"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Dirección actual Jabber/Gtalk confirmada."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Ingresa un apodo o correo electronico"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
@@ -1503,28 +1020,19 @@ msgstr "Recuperar contraseña"
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para usuario desconocido."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Apodo prohibido."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remoto sin perfil coincidente"
 
@@ -1532,9 +1040,7 @@ msgstr "Perfil remoto sin perfil coincidente"
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1550,56 +1056,32 @@ msgstr ""
 "¡Si eliminas tu único OpenID no podrás volver a entrar! Si necesitas "
 "eliminarlo, agrega otro antes."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "Configuración de mensajería instantánea"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Ningún código de confirmación."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Igual a la contraseña de arriba"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Guardar"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Buscar"
 
@@ -1623,52 +1105,25 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
-"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
+"los términos con espacios; deben tener una longitud mínima de 3 "
+"caracteres."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Enviarme avisos por Jabber/GTalk"
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme avisos por Jabber/GTalk"
 
-#: ../actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-
-#: ../actions/imsettings.php:76
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Enviarme avisos por Jabber/GTalk"
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Configuración guardada."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Alguien ya tiene este OpenID."
@@ -1677,45 +1132,36 @@ msgstr "Alguien ya tiene este OpenID."
 msgid "Something weird happened."
 msgstr "Algo raro pasó."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Fuente"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "No se ha encontrado el OpenID almacenado."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Suscriptores"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Suscripciones"
@@ -1724,14 +1170,6 @@ msgstr "Suscripciones"
 msgid "System error uploading file."
 msgstr "Error del sistema al cargar el archivo."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Búsqueda de texto"
@@ -1748,94 +1186,53 @@ msgstr "Esa dirección ya fue confirmada."
 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación no es para ti!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "El Jabber ID ya pertenece a otro usuario."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Ese archivo es demasiado grande."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Ese ya es tu Jabber ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Ese ya es tu Jabber ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Ese no es tu Jabber ID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Ese no es tu Jabber ID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "El Jabber ID ya pertenece a otro usuario."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "La dirección fue eliminada."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 "Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
-"identificador de suscripción es:"
+"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. "
+"Tu identificador de suscripción es:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee "
-"de nuevo las instrucciones para saber cómo rechazar la suscripción "
+"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. "
+"Lee de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
 #: ../actions/subscribers.php:35
@@ -1856,15 +1253,11 @@ msgstr "Estas son las personas que %s escucha."
 msgid "These are the people whose notices you listen to."
 msgstr "Estas son las personas que escuchas."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
-"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
+"Este código de confirmación es demasiado viejo. Por favor empieza de "
+"nuevo."
 
 #: ../lib/openid.php:195
 msgid ""
@@ -1885,44 +1278,24 @@ msgstr ""
 "OpenID a una cuenta local. Puedes crear una nueva o conectarte con la tuya, "
 "si la tienes."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página no está disponible en un tipo de media que aceptes."
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+"To subscribe, you can [login](%%action.login%%), or "
+"[register](%%action.register%%) a new  account. If you already have an "
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 msgstr ""
 "Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
 "[registrar](%%action.register%%) una nueva cuenta. Si ya tienes una en un "
 "[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
 "tu perfil debajo."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "El URL de tu página personal, blog o perfil en otro sitio"
 
@@ -1930,24 +1303,19 @@ msgstr "El URL de tu página personal, blog o perfil en otro sitio"
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Versión desconocida del protocolo OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1960,11 +1328,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Tipo de dirección %s desconocida"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Versión OMB no soportada"
 
@@ -1972,24 +1340,6 @@ msgstr "Versión OMB no soportada"
 msgid "Unsupported image file format."
 msgstr "Formato de imagen no soportado."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Cargar"
@@ -2003,33 +1353,22 @@ msgid ""
 msgstr ""
 "Carga un nuevo \"avatar\" (imagen de usuario) aquí. No puedes editar la "
 "imagen una vez cargada, por lo que antes debes asegurarte que sea más o "
-"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa una "
-"foto que te pertenezca y que quieras compartir."
+"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa "
+"una foto que te pertenezca y que quieras compartir."
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "No se pudo guardar la información del nuevo perfil"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Usado sólo para actualizaciones, anuncios y recuperación de contraseñas"
+"Usado sólo para actualizaciones, anuncios y recuperación de "
+"contraseñas"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
 msgstr "El usuario al que quieres seguir no existe."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
@@ -2037,93 +1376,62 @@ msgstr "El usuario no tiene un perfil."
 msgid "User nickname"
 msgstr "Apodo del usuario"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "No se ha encontrado el OpenID almacenado."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagen incorrecto para '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamaño de imagen incorrecto para '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "¡Ya tienes este OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "¡Ya te has conectado!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Puedes cambiar tu contraseña aquí. ¡Elige una buena!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Puedes crear una nueva cuenta y empezar a enviar avisos."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón \"Eliminar"
-"\"."
+"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón "
+"\"Eliminar\"."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones debajo."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
 "Puedes actualizar la información de tu perfil personal para que la gente "
 "sepa más sobre ti."
@@ -2132,14 +1440,778 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "¡Puedes usar la suscripción local!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "No nos enviaste ese perfil"
 
+#: ../actions/recoverpassword.php:134
+msgid "You've been identified. Enter a  new password below. "
+msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
+
+#: ../actions/openidlogin.php:67
+msgid "Your OpenID URL"
+msgstr "El URL de tu OpenID"
+
+#: ../actions/recoverpassword.php:149
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Tu nombre de usuario en este servidor, o la dirección de correo "
+"electrónico registrada."
+
+#: ../actions/openidsettings.php:28
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
+"cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
+
+#: ../lib/util.php:814
+msgid "a few seconds ago"
+msgstr "hace unos segundos"
+
+#: ../lib/util.php:826
+#, php-format
+msgid "about %d days ago"
+msgstr "hace %d días"
+
+#: ../lib/util.php:822
+#, php-format
+msgid "about %d hours ago"
+msgstr "hace %d horas"
+
+#: ../lib/util.php:818
+#, php-format
+msgid "about %d minutes ago"
+msgstr "hace %d minutos"
+
+#: ../lib/util.php:830
+#, php-format
+msgid "about %d months ago"
+msgstr "hace %d meses"
+
+#: ../lib/util.php:824
+msgid "about a day ago"
+msgstr "hace un día"
+
+#: ../lib/util.php:816
+msgid "about a minute ago"
+msgstr "hace un minuto"
+
+#: ../lib/util.php:828
+msgid "about a month ago"
+msgstr "hace un mes"
+
+#: ../lib/util.php:832
+msgid "about a year ago"
+msgstr "hace un año"
+
+#: ../lib/util.php:820
+msgid "about an hour ago"
+msgstr "hace una hora"
+
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
+msgid "in reply to..."
+msgstr "en respuesta a..."
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
+msgid "reply"
+msgstr "responder"
+
+#: ../actions/password.php:44
+msgid "same as password above"
+msgstr "repita la contraseña anterior"
+
+#: ../lib/util.php:1127
+msgid "« After"
+msgstr "« Después"
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../actions/recoverpassword.php:137
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored  in your account."
+msgstr ""
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr ""
+
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or DELETE."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+msgid ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../lib/mail.php:147
 #, php-format
 msgid ""
@@ -2153,123 +2225,615 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103
+#: ../actions/invite.php:103 actions/invite.php:110
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr "El URL de tu OpenID"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
-"registrada."
-
-#: ../actions/openidsettings.php:28
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-"[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
-"cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
-
-#: ../lib/util.php:943
-msgid "a few seconds ago"
-msgstr "hace unos segundos"
-
-#: ../lib/util.php:955
-#, php-format
-msgid "about %d days ago"
-msgstr "hace %d días"
-
-#: ../lib/util.php:951
-#, php-format
-msgid "about %d hours ago"
-msgstr "hace %d horas"
-
-#: ../lib/util.php:947
-#, php-format
-msgid "about %d minutes ago"
-msgstr "hace %d minutos"
-
-#: ../lib/util.php:959
-#, php-format
-msgid "about %d months ago"
-msgstr "hace %d meses"
-
-#: ../lib/util.php:953
-msgid "about a day ago"
-msgstr "hace un día"
-
-#: ../lib/util.php:945
-msgid "about a minute ago"
-msgstr "hace un minuto"
-
-#: ../lib/util.php:957
-msgid "about a month ago"
-msgstr "hace un mes"
-
-#: ../lib/util.php:961
-msgid "about a year ago"
-msgstr "hace un año"
-
-#: ../lib/util.php:949
-msgid "about an hour ago"
-msgstr "hace una hora"
-
 #: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
-msgid "in reply to..."
-msgstr "en respuesta a..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
-msgid "reply"
-msgstr "responder"
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "repita la contraseña anterior"
-
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 msgid "unsupported file type"
-msgstr "Formato de imagen no soportado."
+msgstr ""
 
-#: ../lib/util.php:1309
-msgid "« After"
-msgstr "« Después"
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No se pudo confirmar el correo electrónico."
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "No se pudo crear la suscripción."
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error al insertar aviso"
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Público"
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""