Permalink
Browse files

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

  • Loading branch information...
2 parents 8c40dd0 + 4638eb8 commit 162ca102faa5df52adf4cac6232771eee1096e85 Phil Sturgeon committed Jul 1, 2010
@@ -40,7 +40,7 @@ public function __construct()
public function index()
{
$this->data->settings = array();
- if($settings = $this->settings_m->getSettings( array('is_gui' => 1 )) )
+ if($settings = $this->settings_m->get_settings( array('is_gui' => 1 )) )
{
// Loop through each setting
foreach($settings as $setting)
@@ -5,20 +5,20 @@
// labels
$lang['photos.upload_label'] = 'Subir';
$lang['photos.photo_label'] = 'Fotografía';
-$lang['photos.caption_label'] = 'Caption'; #translate
+$lang['photos.caption_label'] = 'Caption'; #translate
$lang['photos.view_label'] = 'Ver';
$lang['photos.edit_label'] = 'Editar';
$lang['photos.delete_label'] = 'Eliminar';
$lang['photos.title_label'] = 'Título';
-$lang['photos.upload_success'] = 'Imagen subida completamenteImage uploaded successfully.';
+$lang['photos.upload_success'] = 'Imagen subida completamente.';
$lang['photos.upload_error'] = 'Ocurrió un error al tratar de subir la imagen "%s".';
$lang['photos.delete_no_select_error'] = 'Debes seleccionar al menos una foto para eliminar.';
$lang['photos.delete_success'] = 'El/Las imagen(es) %s fueron eliminadas completamente.';
$lang['photos.delete_error'] = 'No se pudo eliminar ninguna imagen.';
// messages
-$lang['photos.delete_no_select_error'] = 'Deebes seleccionar al menos una foto para eliminar.';
+$lang['photos.delete_no_select_error'] = 'Debes seleccionar al menos una foto para eliminar.';
$lang['photos.photo_delete_success'] = 'Eliminada(s) %s imágene(s) completamente.';
$lang['photos.photo_delete_error'] = 'No se han eliminado las imágenes.';

0 comments on commit 162ca10

Please sign in to comment.