Permalink
Browse files

Merge branch 'master' of github.com:pyrocms/pyrocms

  • Loading branch information...
2 parents d5e46b0 + b2a88c5 commit 38b1122eec6de128dabece90601aa86304af40b1 Phil Sturgeon committed Aug 13, 2010
Showing with 281 additions and 150 deletions.
  1. +2 −1 application/language/dutch/main_lang.php
  2. +2 −1 application/language/english/main_lang.php
  3. +2 −1 application/language/french/main_lang.php
  4. +2 −1 application/language/german/main_lang.php
  5. +2 −1 application/language/polish/main_lang.php
  6. +4 −4 application/language/spanish/admin_lang.php
  7. +1 −1 application/language/spanish/extra_validation_lang.php
  8. +2 −1 application/language/spanish/main_lang.php
  9. +6 −6 application/modules/comments/language/spanish/comments_lang.php
  10. +15 −15 application/modules/modules/language/spanish/modules_lang.php
  11. +2 −2 application/modules/pages/language/spanish/page_layouts_lang.php
  12. +1 −1 application/modules/themes/language/spanish/themes_lang.php
  13. +21 −21 application/modules/users/language/spanish/ion_auth_lang.php
  14. +1 −1 application/modules/variables/language/spanish/variables_lang.php
  15. +8 −5 application/modules/widgets/js/widgets.js
  16. +16 −16 application/modules/widgets/language/spanish/widgets_lang.php
  17. +14 −6 application/modules/widgets/views/admin/ajax/add_area.php
  18. +8 −1 application/views/admin/partials/buttons.php
  19. +2 −1 installer/sql/1-tables.sql
  20. +19 −19 third_party/modules/contact/details.xml
  21. +1 −1 third_party/modules/forums/details.xml
  22. +62 −18 third_party/modules/photos/controllers/admin.php
  23. +2 −1 third_party/modules/photos/language/dutch/photo_albums_lang.php
  24. +2 −1 third_party/modules/photos/language/english/photo_albums_lang.php
  25. +7 −1 third_party/modules/photos/language/english/photos_lang.php
  26. +2 −1 third_party/modules/photos/language/french/photo_albums_lang.php
  27. +7 −1 third_party/modules/photos/language/french/photos_lang.php
  28. +2 −1 third_party/modules/photos/language/german/photo_albums_lang.php
  29. +7 −1 third_party/modules/photos/language/german/photos_lang.php
  30. +2 −1 third_party/modules/photos/language/polish/photo_albums_lang.php
  31. +7 −1 third_party/modules/photos/language/polish/photos_lang.php
  32. +2 −1 third_party/modules/photos/language/spanish/photo_albums_lang.php
  33. +7 −1 third_party/modules/photos/language/spanish/photos_lang.php
  34. +12 −10 third_party/modules/photos/models/photo_albums_m.php
  35. +7 −0 third_party/modules/photos/models/photos_m.php
  36. +6 −1 third_party/modules/photos/views/admin/form.php
  37. +11 −3 third_party/modules/photos/views/admin/manage.php
  38. +5 −1 third_party/modules/photos/views/album.php
@@ -39,6 +39,7 @@
$lang['save_label'] = 'Opslaan';
$lang['cancel_label'] = 'Annuleren';
+$lang['update_label'] = 'Update Caption'; #translate
$lang['delete_label'] = 'Verwijder';
$lang['activate_label'] = 'Activeer';
$lang['approve_label'] = 'Goedkeuren'; #translate
@@ -53,4 +54,4 @@
// $lang[''] = 'nl-nl';
-?>
+?>
@@ -39,6 +39,7 @@
$lang['save_label'] = 'Save';
$lang['cancel_label'] = 'Cancel';
+$lang['update_label'] = 'Update Caption';
$lang['delete_label'] = 'Delete';
$lang['activate_label'] = 'Activate';
$lang['approve_label'] = 'Approve'; #translate
@@ -53,4 +54,4 @@
// $lang[''] = '';
-?>
+?>
@@ -39,6 +39,7 @@
$lang['save_label'] = 'Enregistrer';
$lang['cancel_label'] = 'Annuler';
+$lang['update_label'] = 'Update Caption'; #translate
$lang['delete_label'] = 'Supprimer';
$lang['activate_label'] = 'Activer';
$lang['publish_label'] = 'Publier';
@@ -51,4 +52,4 @@
// $lang[''] = '';
-?>
+?>
@@ -39,6 +39,7 @@
$lang['save_label'] = 'Sichern';
$lang['cancel_label'] = 'Abbrechen';
+$lang['update_label'] = 'Update Caption'; #translate
$lang['delete_label'] = 'Löschen';
$lang['activate_label'] = 'Aktivieren';
$lang['approve_label'] = 'Bestätigen';
@@ -53,4 +54,4 @@
// $lang[''] = '';
-?>
+?>
@@ -39,6 +39,7 @@
$lang['save_label'] = 'Zapisz';
$lang['cancel_label'] = 'Anuluj';
+$lang['update_label'] = 'Update Caption'; #translate
$lang['delete_label'] = 'Kasuj';
$lang['activate_label'] = 'Aktywuj';
$lang['approve_label'] = 'Zatwierdź'; #translate
@@ -53,4 +54,4 @@
// $lang[''] = '';
-?>
+?>
@@ -6,7 +6,7 @@
$lang['cp_welcome_title'] = 'Bienvenido';
$lang['cp_welcome_message'] = 'Bienvenido al Panel de Control de %s. Al usar el menú superior podrás controlar casi todos los aspectos de tu sitio web. Si encuentras algún problema con el sistema, por favor envía tu problema utilizando el "bugtracker" o seguidor de problemas.';
-$lang['cp_news_feed_title'] = 'News feed'; #translate
+$lang['cp_news_feed_title'] = 'Canal de Noticias';
// header
$lang['cp_to_home'] = 'Ir al inicio del Panel de Control';
@@ -28,15 +28,15 @@
$lang['cp_nav_permissions'] = 'Permisos';
$lang['cp_nav_variables'] = 'Variables';
-$lang['cp_must_login'] = 'You must be logged in to view this page.'; #translate
+$lang['cp_must_login'] = 'Debes ingresar en tu cuenta para poder ver esta página.';
$lang['cp_access_denied'] = 'No tienes el permiso suficiente como para ver esta página.';
$lang['cp_delete_installer_message'] = 'Por favor eliminar el directorio "instaler" del servidor. Al dejarlo en línea podrías darle el acceso completo del sitio a otra persona.';
-$lang['cp_upgrade_message'] = 'You are currently running version %s, but your database is version %s. Please <a href="%s">click here</a> to upgrade the database.'; #translate
+$lang['cp_upgrade_message'] = 'Estás corriendo la versión %s, pero tu base de datos es la versión %s. Por favor <a href="%s">pulsa aquí</a> para actualizar la base de datos.';
// Admin-wide text
$lang['cp_sidebar_title'] = 'Menu lateral';
$lang['required_label'] = 'Obligatorio';
-$lang['sb_recent_users'] = 'Recent users'; #translate
+$lang['sb_recent_users'] = 'Últimos usuarios';
?>
@@ -2,7 +2,7 @@
$lang['alpha_dot_dash'] = "The %s field may only contain alpha-numeric characters, underscores, dots and dashes.";
$lang['decimal'] = "The %s field must contain only decimal numbers.";
-$lang['csrf_bad_token'] = "Invalid CSRF Token"; #translate
+$lang['csrf_bad_token'] = "Ficha de CSRF inválida";
/* End of file form_validation_lang.php */
/* Location: ./system/language/english/form_validation_lang.php */
@@ -39,6 +39,7 @@
$lang['save_label'] = 'Grabar';
$lang['cancel_label'] = 'Cancelar';
+$lang['update_label'] = 'Update Caption'; #translate
$lang['delete_label'] = 'Eliminar';
$lang['activate_label'] = 'Activar';
$lang['approve_label'] = 'Aprobars';
@@ -53,4 +54,4 @@
// $lang[''] = '';
-?>
+?>
@@ -4,12 +4,12 @@
$lang['comments.your_comment'] = 'Escribir un comentario';
$lang['comments.user_comments'] = 'Comentarios de usuarios';
-$lang['comments.list_comment'] = '%s commented on %s saying:'; #translate
-$lang['comments.recent_comments'] = 'Recent comments'; #translate
-$lang['comments.view_more'] = 'View more...'; #translate
+$lang['comments.list_comment'] = '%s comentó en %s, dijo:';
+$lang['comments.recent_comments'] = 'Últimos comentarios';
+$lang['comments.view_more'] = 'Leer más';
// labels
-$lang['comments.name_label'] = 'Tu nombre';
+$lang['comments.name_label'] = 'Nombre';
$lang['comments.email_label'] = 'Correo electr&oacute;nico';
$lang['comments.website_label'] = 'Sitio web';
$lang['comments.message_label'] = 'Mensaje';
@@ -18,7 +18,7 @@
$lang['comments.deactivate_label'] = 'Desactivar';
$lang['comments.author_label'] = 'Autor';
$lang['comments.module_label'] = 'M&oacute;dulo';
-$lang['comments.item_label'] = 'Item'; #translate
+$lang['comments.item_label'] = 'Ítem';
$lang['comments.date_label'] = 'Fecha';
$lang['comments.actions_label'] = 'Acciones';
$lang['comments.edit_label'] = 'Editar';
@@ -52,6 +52,6 @@
$lang['comments.delete_single_success'] = 'El comentario #%s fue eliminado y no será mostrado más en el sitio.';
$lang['comments.delete_multi_success'] = 'Los comentarios #%s fueron eliminados y no serán mostrados más en el sitio.';
-$lang['comments.no_comments'] = 'No hay comentarios hasta el momento';
+$lang['comments.no_comments'] = 'No hay comentarios aún';
?>
@@ -1,18 +1,18 @@
<?php
-$lang['modules.core_list'] = 'Core Modules'; #Translate
-$lang['modules.third_party_list'] = 'Third-Party Modules'; #Translate
+$lang['modules.core_list'] = 'Módulos Básicos';
+$lang['modules.third_party_list'] = 'Módulos de terceros';
$lang['modules.introduction'] = 'Debajo hay una lista de los módulos instalados y su informaci&oacute;n, como la descripci&oacute;n y la versión del mismo.';
-$lang['modules.disable_error'] = 'Could not disable the module "%s".'; #Translate
-$lang['modules.disable_success'] = 'The module "%s" has been disabled.'; #Translate
-$lang['modules.enable_error'] = 'Could not enable the module "%s".'; #Translate
-$lang['modules.enable_success'] = 'The module "%s" has been enabled.'; #Translate
-$lang['modules.install_error'] = 'Could not install the module.'; #Translate
-$lang['modules.install_success'] = 'The module has been installed.'; #Translate
-$lang['modules.uninstall_error'] = 'Could not uninstall the module "%s".'; #Translate
-$lang['modules.uninstall_success'] = 'The module "%s" has been uninstalled.'; #Translate
-$lang['modules.already_exists_error'] = 'A module with the name "%s" already exists.'; #Translate
-$lang['modules.module_not_specified'] = 'You must specifiy a module.'; #Translate
+$lang['modules.disable_error'] = 'No se ha podido desactivar el módulo "%s".';
+$lang['modules.disable_success'] = 'El módulo "%s" ha sido desactivado.';
+$lang['modules.enable_error'] = 'No se ha podido activar el módulo "%s".';
+$lang['modules.enable_success'] = 'El módulo "%s" ha sido activado.';
+$lang['modules.install_error'] = 'No se ha podido instalar el módulo.';
+$lang['modules.install_success'] = 'El módulo ha sido instalado.';
+$lang['modules.uninstall_error'] = 'No se ha podido desinstalar el módulo "%s".';
+$lang['modules.uninstall_success'] = 'El módulo "%s" se ha desinstalado.';
+$lang['modules.already_exists_error'] = 'Ya existe un módulo con el nombre "%s".';
+$lang['modules.module_not_specified'] = 'Debes especificar un módulo.';
-$lang['modules.manually_remove'] = 'You must manually remove "%s" to completely remove the module.'; #Translate
-$lang['modules.upload_title'] = 'Upload Module'; #Translate
-$lang['modules.upload_desc'] = 'Please select a file and click Upload button'; #Translate
+$lang['modules.manually_remove'] = 'Debes remover manualmente el módulo "%s" completamente.';
+$lang['modules.upload_title'] = 'Cargar módulo';
+$lang['modules.upload_desc'] = 'Por favor selecciona un archivo y pulsa sobre el botón Cargar';
@@ -10,13 +10,13 @@
$lang['page_layouts.updated_label'] = 'Updated';
$lang['page_layouts.actions_label'] = 'Actions';
$lang['page_layouts.title_label'] = 'Title';
-$lang['page_layouts.theme_layout_label'] = 'Theme Layout'; #translate
+$lang['page_layouts.theme_layout_label'] = 'Tema de diseño';
$lang['page_layouts.edit_label'] = 'Edit';
$lang['page_layouts.delete_label'] = 'Delete';
// titles
-$lang['page_layouts.list_title'] = 'List page layouts'; //Needs to be translated
+$lang['page_layouts.list_title'] = 'Listar diseños de página';
$lang['page_layouts.create_title'] = 'Add page layout';
$lang['page_layouts.edit_title'] = 'Edit page layout "%s"';
@@ -8,7 +8,7 @@
$lang['themes.default_delete_error'] = 'No puedes borrar el tema predeterminado.';
$lang['themes.delete_error'] = 'Imposible eliminar el directorio "%s".';
$lang['themes.mass_delete_success'] = '%s temas de %s disponibles fueron eliminados.';
-$lang['themes.mass_delete_error'] = 'Only %s themes out of %s themes were deleted.'; #translate
+$lang['themes.mass_delete_error'] = 'Se han eliminado %s temas de un total de %s.';
$lang['themes.delete_select_error'] = 'Debes seleccionar un tema para eliminar primero.';
$lang['themes.upload_title'] = 'Subir tema';
$lang['themes.list_label'] = 'Lista de temas';
@@ -15,36 +15,36 @@
*/
// Account Creation
-$lang['account_creation_successful'] = 'Account Successfully Created';
-$lang['account_creation_unsuccessful'] = 'Unable to Create Account';
-$lang['account_creation_duplicate_email'] = 'Email Already Used or Invalid';
-$lang['account_creation_duplicate_username'] = 'Username Already Used or Invalid';
+$lang['account_creation_successful'] = 'Cuenta creada de forma satisfactoria';
+$lang['account_creation_unsuccessful'] = 'No se ha podido crear la cuenta';
+$lang['account_creation_duplicate_email'] = 'Correo electrónico existente o inválido';
+$lang['account_creation_duplicate_username'] = 'Nombre de usuario existente o inválido';
// Password
-$lang['password_change_successful'] = 'Password Successfully Changed';
-$lang['password_change_unsuccessful'] = 'Unable to Change Password';
-$lang['forgot_password_successful'] = 'Password Reset Email Sent';
-$lang['forgot_password_unsuccessful'] = 'Unable to Reset Password';
+$lang['password_change_successful'] = 'Contraseña cambiada satisfactoriamente';
+$lang['password_change_unsuccessful'] = 'No se ha podido cambiar la contraseña';
+$lang['forgot_password_successful'] = 'Se ha enviado un correo para reiniciar su contraseña';
+$lang['forgot_password_unsuccessful'] = 'No se ha podido reiniciar su contraseña';
// Activation
-$lang['activate_successful'] = 'Account Activated';
-$lang['activate_unsuccessful'] = 'Unable to Activate Account';
-$lang['deactivate_successful'] = 'Account De-Activated';
-$lang['deactivate_unsuccessful'] = 'Unable to De-Activate Account';
-$lang['activation_email_successful'] = 'Activation Email Sent';
-$lang['activation_email_unsuccessful'] = 'Unable to Send Activation Email';
+$lang['activate_successful'] = 'Cuenta activada';
+$lang['activate_unsuccessful'] = 'No se ha podido activar la cuenta';
+$lang['deactivate_successful'] = 'Cuenta desactivada';
+$lang['deactivate_unsuccessful'] = 'No se ha podido desactivar la cuenta';
+$lang['activation_email_successful'] = 'Correo de activación enviado';
+$lang['activation_email_unsuccessful'] = 'No se ha podido enviar el correo de activación';
// Login / Logout
-$lang['login_successful'] = 'Logged In Successfully';
-$lang['login_unsuccessful'] = 'In-Correct Login';
-$lang['logout_successful'] = 'Logged Out Successfully';
+$lang['login_successful'] = 'Has ingresado en tu cuenta';
+$lang['login_unsuccessful'] = 'No has podido ingresar en tu cuenta';
+$lang['logout_successful'] = 'Has salido de tu cuenta';
// Account Changes
-$lang['update_successful'] = 'Account Information Successfully Updated';
-$lang['update_unsuccessful'] = 'Unable to Update Account Information';
-$lang['delete_successful'] = 'User Deleted';
-$lang['delete_unsuccessful'] = 'Unable to Delete User';
+$lang['update_successful'] = 'La información de la cuenta ha sido actualizada';
+$lang['update_unsuccessful'] = 'No se ha podido actualizar la información de la cuenta';
+$lang['delete_successful'] = 'Usuario eliminado';
+$lang['delete_unsuccessful'] = 'No se ha podido eliminar el usuario';
?>
@@ -1,7 +1,7 @@
<?php
// labels
-$lang['var_syntax_label'] = 'Syntax'; #translate
+$lang['var_syntax_label'] = 'Sintaxis';
$lang['var_name_label'] = 'Nombre';
$lang['var_data_label'] = 'Valor';
$lang['var_actions_label'] = 'Acciones';
@@ -144,7 +144,7 @@
slug = this.id.replace('delete-area-', '')
box = $('div#area-' + slug);
- if(confirm(''))
+ if(confirm('Are you sure you wish to delete this item?'))
{
$.post(BASE_URI + 'index.php/widgets/ajax/delete_widget_area', { area_slug: slug }, function()
{
@@ -256,13 +256,16 @@
tr = $(this).closest('tr');
id = tr.attr('id').replace('instance-', '');
- $.post(BASE_URI + 'index.php/widgets/ajax/delete_widget_instance', { instance_id: id }, function(html){
- tr.slideUp(function() { $(this).remove(); });
- });
+ if(confirm('Are you sure you wish to delete this item?'))
+ {
+ $.post(BASE_URI + 'index.php/widgets/ajax/delete_widget_instance', { instance_id: id }, function(html){
+ tr.slideUp(function() { $(this).remove(); });
+ });
+ }
return false;
});
});
-})(jQuery);
+})(jQuery);
@@ -1,30 +1,30 @@
<?php
// sidebar
-$lang['widgets.available_title'] = 'Available widgets';
+$lang['widgets.available_title'] = 'Widgets disponibles';
// Widgets
$lang['widgets.widget'] = 'Widget';
-$lang['widgets.widget_author'] = 'Author';
-$lang['widgets.widget_short_name'] = 'Short name';
-$lang['widgets.widget_version'] = 'Version';
+$lang['widgets.widget_author'] = 'Autor';
+$lang['widgets.widget_short_name'] = 'Nombre corto';
+$lang['widgets.widget_version'] = 'Versión';
// Widget area titles
-$lang['widgets.add_area'] = 'Add widget area';
-$lang['widgets.delete_area'] = 'Delete area';
+$lang['widgets.add_area'] = 'Agregar área de widget';
+$lang['widgets.delete_area'] = 'Eliminar área';
// Widget area field names
-$lang['widgets.widget_area'] = 'Area';
-$lang['widgets.widget_area_title'] = 'Area name';
-$lang['widgets.widget_area_slug'] = 'Area short name';
+$lang['widgets.widget_area'] = 'Área';
+$lang['widgets.widget_area_title'] = 'Nombre de área';
+$lang['widgets.widget_area_slug'] = 'Nombre corto del área';
// Widget instance titles
-$lang['widgets.add_instance'] = 'Add widget instance';
-$lang['widgets.edit_instance'] = 'Edit widget instance';
-$lang['widgets.delete_instance'] = 'Delete widget instance';
+$lang['widgets.add_instance'] = 'Agregar instancia del widget';
+$lang['widgets.edit_instance'] = 'Editar instancia del widget';
+$lang['widgets.delete_instance'] = 'Eliminar instancia del widget';
-$lang['widgets.instance_title'] = 'Title';
-$lang['widgets.tag_title'] = 'Tag'; #translate
+$lang['widgets.instance_title'] = 'Título';
+$lang['widgets.tag_title'] = 'Etiqueta';
-$lang['widgets.instance_edit'] = 'Edit';
-$lang['widgets.instance_delete'] = 'Delete';
+$lang['widgets.instance_edit'] = 'Editar';
+$lang['widgets.instance_delete'] = 'Eliminar';
@@ -2,14 +2,22 @@
<h3><?php echo $widget_area->title; ?></h3>
<div class="box-container">
+
+ <div class="header-squish">
+
+ <span class="tag">
+ <?php echo sprintf('{widget_area(\'%s\')}', $widget_area->slug);?>
+ </span>
- <div class="button float-right">
- <a id="delete-area-<?php echo $widget_area->slug; ?>" class="delete-area" href="#">
- <?php echo lang('widgets.delete_area'); ?>
- </a>
- </div>
+ <div class="button float-right">
+ <a id="delete-area-<?php echo $widget_area->slug; ?>" class="delete-area" href="#">
+ <?php echo lang('widgets.delete_area'); ?>
+ </a>
+ </div>
+
+ </div>
<div class="widget-list"></div>
</div>
-</div>
+</div>
Oops, something went wrong.

0 comments on commit 38b1122

Please sign in to comment.