diff --git a/po/es.po b/po/es.po
index 03bb9a19..ffe97f85 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,242 +2,475 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Jorge Bianquetti <jbianquetti@gmail.com>, 2010
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-02 06:01+0000\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"
+"Project-Id-Version: SparklesShare 0.2 Alpha\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=sparkleshare\n"
+"POT-Creation-Date: 2010-08-30 06:25+0000\n"
+"PO-Revision-Date: 2010-08-30 10:41-0300\n"
+"Last-Translator: Claudio Rodrigo Pereyra Diaz <claudiorodrigo@pereyradiaz.com.ar>\n"
+"Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Generator: MonoDevelop Gettext addin\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../SparkleShare/SparkleDialog.cs:50
-msgid "Address of remote SparkleShare folder:"
-msgstr "Dirección de la carpeta SparkleShare remoto:"
-
-#: ../SparkleShare/SparkleDialog.cs:81
-#, fuzzy
-msgid "Add Folder"
-msgstr "Añade una Carpeta"
-
-#: ../SparkleShare/SparkleDialog.cs:126
-#, csharp-format
-msgid "Syncing folder ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:127
-msgid "SparkleShare will notify you when this is done."
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:129
-msgid "Dismiss"
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:157
-#, csharp-format
-msgid "Something went wrong while syncing ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:167
-msgid "Try Again…"
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:197
-#, csharp-format
-msgid "Successfully synced folder ‘{0}’"
-msgstr ""
-
-#: ../SparkleShare/SparkleDialog.cs:198
-msgid "Now make great stuff happen!"
-msgstr ""
-
-#. Add a button to open the folder where the changed file is
-#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319
-#: ../SparkleShare/SparkleWindow.cs:62
-msgid "Open Folder"
-msgstr "Abrir Carpeta"
-
-#: ../SparkleShare/SparkleHelpers.cs:159
-#, csharp-format
-msgid "a second ago"
-msgid_plural "{0} seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleHelpers.cs:165
-#, csharp-format
-msgid "a minute ago"
-msgid_plural "about {0} minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleHelpers.cs:171
-#, csharp-format
-msgid "about an hour ago"
-msgid_plural "about {0} hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleHelpers.cs:177
-#, csharp-format
-msgid "yesterday"
-msgid_plural "{0} days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleHelpers.cs:183
-#, csharp-format
-msgid "a month ago"
-msgid_plural "{0} months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleHelpers.cs:188
-#, csharp-format
-msgid "a year ago"
-msgid_plural "{0} years ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SparkleShare/SparkleHelpers.cs:197
-msgid "Hold your ponies!"
-msgstr ""
-
-#: ../SparkleShare/SparkleHelpers.cs:198
-msgid ""
-"SparkleShare is known to be insanely fast with \n"
-"pictures of unicorns. Please make sure your internets\n"
-"are upgraded to the latest version to avoid problems."
-msgstr ""
-
-#: ../SparkleShare/SparkleShare.cs:50
+#: ../SparkleDiff/SparkleDiff.cs:78
+#: ../SparkleShare/SparkleShare.cs:58
 msgid "Git wasn't found."
 msgstr "No se ha encontrado Git."
 
-#: ../SparkleShare/SparkleShare.cs:51
+#: ../SparkleDiff/SparkleDiff.cs:79
+#: ../SparkleShare/SparkleShare.cs:59
 msgid "You can get Git from http://git-scm.com/."
 msgstr "Puedes obtener Git en http://git-scm.com/."
 
-#: ../SparkleShare/SparkleShare.cs:58
+#: ../SparkleDiff/SparkleDiff.cs:87
+#: ../SparkleShare/SparkleShare.cs:71
 msgid "Sorry, you can't run SparkleShare with these permissions."
-msgstr "No se puede ejecutar SparkleShare con estos permisos."
+msgstr "Perdón, no puede ejecutar SparkleShare con estos permisos."
 
-#: ../SparkleShare/SparkleShare.cs:59
-msgid "Things will go utterly wrong."
-msgstr "Algo va a ir mal."
+#: ../SparkleDiff/SparkleDiff.cs:88
+#: ../SparkleShare/SparkleShare.cs:72
+msgid "Things would go utterly wrong."
+msgstr "Las cosas irían absolutamente mal."
 
-#: ../SparkleShare/SparkleShare.cs:87
-msgid "SparkleShare Copyright (C) 2010 Hylke Bons"
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:162
+msgid "SparkleDiff Copyright (C) 2010 Hylke Bons"
+msgstr "SparkleDiff Copyright (C) 2010 Hylke Bons"
 
-#: ../SparkleShare/SparkleShare.cs:89
+#: ../SparkleDiff/SparkleDiff.cs:164
+#: ../SparkleShare/SparkleShare.cs:112
 msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr ""
+msgstr "Este programa viene SIN GARANTÍAS ABSOLUTAS."
 
-#: ../SparkleShare/SparkleShare.cs:90
+#: ../SparkleDiff/SparkleDiff.cs:165
+#: ../SparkleShare/SparkleShare.cs:114
 msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
+msgstr "Esto es software libre, y es bienvenido a redistribuirlo"
 
-#: ../SparkleShare/SparkleShare.cs:91
+#: ../SparkleDiff/SparkleDiff.cs:166
+#: ../SparkleShare/SparkleShare.cs:115
 msgid "under certain conditions. Please read the GNU GPLv3 for details."
-msgstr ""
+msgstr "bajo determinadas condiciones. Por favor lea la GNU GPLv3 para más detalles."
 
-#: ../SparkleShare/SparkleShare.cs:93
-msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories."
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:168
+msgid "SparkleDiff let's you compare revisions of an image file side by side."
+msgstr "SparkleDiff le permite comparar revisiones de sus archivos de imágen lado a lado."
 
-#: ../SparkleShare/SparkleShare.cs:95
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:170
+msgid "Usage: sparklediff [FILE]"
+msgstr "Uso: sparklediff [ARCHIVO]"
 
-#: ../SparkleShare/SparkleShare.cs:96
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr ""
+#: ../SparkleDiff/SparkleDiff.cs:171
+msgid "Open an image file to show its revisions"
+msgstr "Abrir un archivo de imagen para ver sus revisiones"
 
-#: ../SparkleShare/SparkleShare.cs:98
+#: ../SparkleDiff/SparkleDiff.cs:173
+#: ../SparkleShare/SparkleShare.cs:123
 msgid "Arguments:"
-msgstr ""
+msgstr "Parámetros:"
 
-#: ../SparkleShare/SparkleShare.cs:99
-msgid "\t -d, --disable-gui\tDon't show the notification icon."
-msgstr ""
-
-#: ../SparkleShare/SparkleShare.cs:100
+#: ../SparkleDiff/SparkleDiff.cs:174
 msgid "\t -h, --help\t\tDisplay this help text."
-msgstr ""
+msgstr "\t -h, --help\t\tMuestra este texto de ayuda."
 
-#: ../SparkleShare/SparkleStatusIcon.cs:69
-msgid "Error syncing"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:72
-msgid "Everything is up to date"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:75
-msgid "Syncing…"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-#, fuzzy
-msgid "Add a Remote Folder…"
-msgstr "Añade una Carpeta"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:124
-msgid "Show Notifications"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:142
-msgid "Visit Website"
-msgstr ""
-
-#: ../SparkleShare/SparkleStatusIcon.cs:159
-msgid "Quit"
-msgstr ""
-
-#: ../SparkleShare/SparkleUI.cs:134
-msgid "Welcome to SparkleShare!"
-msgstr "Bienvenido a SparkleShare!"
-
-#: ../SparkleShare/SparkleUI.cs:135
-msgid "You don't have any folders set up yet."
-msgstr ""
-
-#: ../SparkleShare/SparkleUI.cs:138
-#, fuzzy
-msgid "Add a Folder…"
-msgstr "Añade una Carpeta"
-
-#: ../SparkleShare/SparkleWindow.cs:50
+#: ../SparkleDiff/SparkleDiffWindow.cs:92
 #, csharp-format
-msgid "‘{0}’ on {1}"
+msgid "{0} at {1}"
+msgstr "{0} de {1}"
+
+#: ../SparkleDiff/SparkleDiffWindow.cs:93
+msgid "ddd MMM d, yyyy"
+msgstr "ddd MMM d, yyyy"
+
+#: ../SparkleDiff/SparkleDiffWindow.cs:94
+msgid "H:mm"
+msgstr "H:mm"
+
+#: ../SparkleLib/SparkleHelpers.cs:155
+#, csharp-format
+msgid "a second ago"
+msgid_plural "{0} seconds ago"
+msgstr[0] "hace un segundo"
+msgstr[1] "hace {0} segundos"
+
+#: ../SparkleLib/SparkleHelpers.cs:161
+#, csharp-format
+msgid "a minute ago"
+msgid_plural "about {0} minutes ago"
+msgstr[0] "hace un minuto"
+msgstr[1] "hace {0} minutos"
+
+#: ../SparkleLib/SparkleHelpers.cs:167
+#, csharp-format
+msgid "about an hour ago"
+msgid_plural "about {0} hours ago"
+msgstr[0] "hace 1 hora"
+msgstr[1] "hace {0} horas"
+
+#: ../SparkleLib/SparkleHelpers.cs:173
+#, csharp-format
+msgid "yesterday"
+msgid_plural "{0} days ago"
+msgstr[0] "ayer"
+msgstr[1] "hace {0} días"
+
+#: ../SparkleLib/SparkleHelpers.cs:179
+#, csharp-format
+msgid "a month ago"
+msgid_plural "{0} months ago"
+msgstr[0] "hace un mes"
+msgstr[1] "hace {0} meses"
+
+#: ../SparkleLib/SparkleHelpers.cs:184
+#, csharp-format
+msgid "a year ago"
+msgid_plural "{0} years ago"
+msgstr[0] "hace un año"
+msgstr[1] "hace {0} años"
+
+#: ../SparkleLib/SparkleOptions.cs:486
+msgid "OptionName"
+msgstr "NombreOpción"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:108
+msgid "Get Earlier Version"
+msgstr "Obtener versión anterior"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:109
+msgid "Make a copy of an earlier version in this folder"
+msgstr "Hacer una copia de una versión anterior en esta carpeta"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:122
+msgid "Select to get a copy of this version"
+msgstr "Seleccionar para obtener una copia de esta versión"
+
+#: ../SparkleShare/SparkleIntro.cs:65
+msgid "Welcome to SparkleShare!"
+msgstr "¡Bienvenido a SparkleShare!"
+
+#: ../SparkleShare/SparkleIntro.cs:71
+msgid "Before we can create a SparkleShare folder on this computer, we need a few bits of information from you."
+msgstr "Antes de que podamos crear una carpeta de SparkleShare en este equipo, necesitamos un poco de información de usted."
+
+#: ../SparkleShare/SparkleIntro.cs:83
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../SparkleShare/SparkleIntro.cs:99
+msgid "Email:"
+msgstr "Correo electrónico:"
+
+#: ../SparkleShare/SparkleIntro.cs:110
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../SparkleShare/SparkleIntro.cs:117
+msgid "Configuring…"
+msgstr "Configurando…"
+
+#: ../SparkleShare/SparkleIntro.cs:162
+msgid "Where is your remote folder?"
+msgstr "¿Dónde está su carpeta remota?"
+
+#: ../SparkleShare/SparkleIntro.cs:175
+msgid "ssh://address-to-my-server/"
+msgstr "ssh://direccion-a-mi-servidor/"
+
+#: ../SparkleShare/SparkleIntro.cs:180
+msgid "On my own server:"
+msgstr "En mi propio servidor:"
+
+#: ../SparkleShare/SparkleIntro.cs:187
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Alojamiento libre para proyectos de Software Libre y Código Abierto."
+
+#: ../SparkleShare/SparkleIntro.cs:188
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "También tiene cuentas pagas para tener más espacio y ancho de banda privado."
+
+#: ../SparkleShare/SparkleIntro.cs:196
+msgid "The GNOME Project"
+msgstr "El Proyecto GNOME"
+
+#: ../SparkleShare/SparkleIntro.cs:198
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME es una interfaz para su equipo fácil de entender."
+
+#: ../SparkleShare/SparkleIntro.cs:199
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "Seleccione esta opción si usted es un desarrollador o diseñador trabajando en GNOME."
+
+#: ../SparkleShare/SparkleIntro.cs:207
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleIntro.cs:209
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Completamente Libre como en la infraestructura de la Libertad."
+
+#: ../SparkleShare/SparkleIntro.cs:210
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Cuentas gratis para proyectos Libres y de Código Abierto."
+
+#: ../SparkleShare/SparkleIntro.cs:273
+#: ../SparkleShare/SparkleInvitation.cs:134
+msgid "Folder Name:"
+msgstr "Nombre de la carpeta:"
+
+#: ../SparkleShare/SparkleIntro.cs:283
+msgid "Sync"
+msgstr "Sincronizar"
+
+#: ../SparkleShare/SparkleIntro.cs:334
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../SparkleShare/SparkleIntro.cs:345
+msgid "Skip"
+msgstr "Saltar"
+
+#: ../SparkleShare/SparkleIntro.cs:379
+#: ../SparkleShare/SparkleInvitation.cs:277
+msgid "Something went wrong…"
+msgstr "Algo salió mal..."
+
+#: ../SparkleShare/SparkleIntro.cs:385
+msgid "Try Again"
+msgstr "Intentar de nuevo"
+
+#: ../SparkleShare/SparkleIntro.cs:412
+#: ../SparkleShare/SparkleInvitation.cs:310
+msgid "Folder synced successfully!"
+msgstr "¡Carpeta sincronizada con exito!"
+
+#: ../SparkleShare/SparkleIntro.cs:418
+#: ../SparkleShare/SparkleInvitation.cs:316
+msgid "Now you can access the synced files from ‘"
+msgstr "Ahora usted puede acceder los archvos sincronizados desde ‘"
+
+#: ../SparkleShare/SparkleIntro.cs:425
+#: ../SparkleShare/SparkleInvitation.cs:323
+msgid "Open Folder"
+msgstr "Abrir carpeta"
+
+#: ../SparkleShare/SparkleIntro.cs:441
+#: ../SparkleShare/SparkleIntro.cs:484
+#: ../SparkleShare/SparkleIntro.cs:550
+#: ../SparkleShare/SparkleInvitation.cs:338
+#: ../SparkleShare/SparkleInvitation.cs:381
+msgid "Finish"
+msgstr "Finalizar"
+
+#: ../SparkleShare/SparkleIntro.cs:468
+#: ../SparkleShare/SparkleInvitation.cs:365
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Sincronizando carpeta ‘{0}’…"
+
+#: ../SparkleShare/SparkleIntro.cs:475
+#: ../SparkleShare/SparkleInvitation.cs:372
+msgid "This may take a while.\n"
+msgstr "Esto puede tardar un rato.\n"
+
+#: ../SparkleShare/SparkleIntro.cs:476
+#: ../SparkleShare/SparkleInvitation.cs:373
+msgid "You sure it’s not coffee o-clock?"
+msgstr "¿Seguro que no es hora del café?"
+
+#: ../SparkleShare/SparkleIntro.cs:525
+msgid "SparkleShare is ready to go!"
+msgstr "¡SparkleShare esta listo para usar!"
+
+#: ../SparkleShare/SparkleIntro.cs:531
+msgid ""
+"Now you can start accepting invitations from others. \n"
+"Just click on invitations you get by email and we will take care of the rest."
 msgstr ""
+"Ahora puede empezar a aceptar invitaciones de otros.\n"
+"Solo haga click en las invitaciones que reciba por correo electrónico y nosotros encargaremos del resto."
+
+#: ../SparkleShare/SparkleIntro.cs:542
+msgid "Learn how to host your own SparkleServer"
+msgstr "Aprenda como hospedar su propio SparkleServer"
+
+#: ../SparkleShare/SparkleInvitation.cs:104
+msgid "Invitation received!"
+msgstr "¡Invitación recibida!"
+
+#: ../SparkleShare/SparkleInvitation.cs:110
+msgid ""
+"You've received an invitation to join a shared folder.\n"
+"We're ready to hook you up immediately if you wish."
+msgstr ""
+"Usted ha recibido una invitación a unirse a una carpeta compartida.\n"
+"Estamos listos para unirte en cuanto lo desees."
+
+#: ../SparkleShare/SparkleInvitation.cs:116
+msgid "Do you accept this invitation?"
+msgstr "¿Acepta esta invitación?"
+
+#: ../SparkleShare/SparkleInvitation.cs:125
+msgid "Server Address:"
+msgstr "Dirección del servidor:"
+
+#: ../SparkleShare/SparkleInvitation.cs:148
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../SparkleShare/SparkleInvitation.cs:149
+msgid "Accept and Sync"
+msgstr "Aceptar y Sincronizar"
+
+#: ../SparkleShare/SparkleInvitation.cs:283
+msgid "Close"
+msgstr "Cerrar"
+
+#. TRANSLATORS: {0} is a folder name, and {1} is a server address
+#: ../SparkleShare/SparkleLog.cs:53
+#, csharp-format
+msgid "Recent Events in ‘{0}’"
+msgstr "Eventos Recientes en  ‘{0}’"
+
+#: ../SparkleShare/SparkleLog.cs:65
+msgid "_Open Folder"
+msgstr "_Abrir Carpeta"
+
+#: ../SparkleShare/SparkleShare.cs:82
+msgid "Don't show the notification icon"
+msgstr "No mostrar el icono de notificaciones"
+
+#: ../SparkleShare/SparkleShare.cs:83
+msgid "Show this help text"
+msgstr "Mostrar este texto de ayuda"
+
+#: ../SparkleShare/SparkleShare.cs:84
+msgid "Print version information"
+msgstr "Muestra la información de la versión"
+
+#: ../SparkleShare/SparkleShare.cs:109
+msgid "SparkleShare, an instant update workflow to Git."
+msgstr "SparkleShare, un flujo de trabajo de actualización instantánea a Git."
+
+#: ../SparkleShare/SparkleShare.cs:110
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/SparkleShare.cs:117
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr "SparkleShare sincroniza automaticamente repositorios Git en "
+
+#: ../SparkleShare/SparkleShare.cs:118
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr "La carpeta ~/SparkleShare el origen remoto."
+
+#: ../SparkleShare/SparkleShare.cs:120
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "Uso: sparkleshare [start|stop|restart] [OPCION]..."
+
+#: ../SparkleShare/SparkleShare.cs:121
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr "Sincronizar carpeta SparkleShare con el repositorio remoto."
+
+#: ../SparkleShare/SparkleShare.cs:133
+msgid "SparkleShare "
+msgstr "SparkleShare"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:175
+#, csharp-format
+msgid "{0:##.##} ᴛʙ"
+msgstr "{0:##.##} ᴛʙ"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:177
+#, csharp-format
+msgid "{0:##.##} ɢʙ"
+msgstr "{0:##.##} ɢʙ"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:179
+#, csharp-format
+msgid "{0:##.##} ᴍʙ"
+msgstr "{0:##.##} ᴍʙ"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:181
+#, csharp-format
+msgid "{0:##.##} ᴋʙ"
+msgstr "{0:##.##} ᴋʙ"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:243
+msgid "No Shared Folders Yet"
+msgstr "Todavía no hay carpetas compartidas"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:251
+msgid "Sync Remote Folder…"
+msgstr "Sincronizando carpeta remota..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:264
+msgid "Show Notifications"
+msgstr "Mostrar notificaciones"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:285
+msgid "Visit Website"
+msgstr "Visitar el sitio web"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:302
+msgid "Quit"
+msgstr "Salir"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:377
+msgid "Up to date"
+msgstr "Actualizado"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:386
+msgid "Syncing…"
+msgstr "Sincronizando..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:398
+msgid "Failed to sync changes"
+msgstr "Fallo al sincronizar cambios"
+
+#: ../SparkleShare/SparkleUI.cs:338
+msgid "Ouch! Mid-air collision!"
+msgstr "¡Ohh! ¡Hay una colisión!"
+
+#: ../SparkleShare/SparkleUI.cs:339
+msgid "Don't worry, SparkleShare made a copy of each conflicting file."
+msgstr "No se preocupe, SparkleShare hace una copia de cada archivo en conflicto."
+
+#: ../SparkleShare/SparkleUI.cs:478
+msgid "Hold your ponies!"
+msgstr "¡Sostenga sus ponis!"
+
+#: ../SparkleShare/SparkleUI.cs:479
+msgid "SparkleShare is known to be insanely fast with pictures of unicorns. Please make sure your internets are upgraded to the latest version to avoid any problems."
+msgstr "SparkleShare es conocido por ser increíblemente rápido con sus fotos de unicornios. Por favor esté seguro que su copia en internet esta actualizada a la última versión para evitar cualquier problema."
+
+#~ msgid "Address of remote SparkleShare folder:"
+#~ msgstr "Dirección de la carpeta SparkleShare remoto:"
+
+#, fuzzy
+#~ msgid "Add Folder"
+#~ msgstr "Añade una Carpeta"
+
+#, fuzzy
+#~ msgid "Add a Folder…"
+#~ msgstr "Añade una Carpeta"
 
 #~ msgid "folder-sparkleshare"
 #~ msgstr "Carpeta-sparkleshare"
 
-#~ msgid "Folder Name:   "
-#~ msgstr "Nombre de Carpeta:   "
-
 #~ msgid "<span size='small'><i>Example: "
 #~ msgstr "<span size='small'><i>Ejemplo: "
 
 #~ msgid "‘Project’.</i></span>"
 #~ msgstr "‘Proyecto’.</i></span>"
 
-#~ msgid "Remote address:   "
-#~ msgstr "Dirección remota:   "
-
 #~ msgid "Downloading files,\n"
 #~ msgstr "Descargando archivos,\n"
 
-#~ msgid "this may take a while..."
-#~ msgstr "esto puede tardar un rato..."
-
 #~ msgid "[Config] Created '"
 #~ msgstr "[Config] Creado '"