diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-04 20:19:52 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-04 20:19:52 +0100 |
| commit | 383dc9895eac5f1b8ee2a938bfff4a1482228817 (patch) | |
| tree | a6af696a4ecd6259628f2885e23eadb637603b30 /inc/lang/es | |
| parent | ecd445c000e4e54bf7228890848222312cffd3e3 (diff) | |
| parent | 2005b6b650f2523cb58a005961a55a6f099c70c3 (diff) | |
| download | rpg-383dc9895eac5f1b8ee2a938bfff4a1482228817.tar.gz rpg-383dc9895eac5f1b8ee2a938bfff4a1482228817.tar.bz2 | |
Merge branch 'master' into future
* master: (45 commits)
TarLib code cleanup
TarLib: fixed appending in non-dynamic mode
fixed third method of adding files in TarLib
fix lone zero block in TarLib created archives
fix use of constructor in TarLib
Slovak language update
Korean language update
Latvian language update
removed redundant variables in tpl_include_page() (because of 3ff8773b)
added cut off points for mobile devices as parameters to style.ini
Corrected typo: ruke -> rule
Persian language update
Spanish language update
russian language update
Kazach language update
correctly check hash parameter in media dispatcher FS#2648
avoid broken browser_uid on IE
Removed acronyms for "Perl" and "PERL" as Perl is not an acronym. See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
Made striplangs.php executable
release preparations
...
Diffstat (limited to 'inc/lang/es')
| -rw-r--r-- | inc/lang/es/lang.php | 1 | ||||
| -rw-r--r-- | inc/lang/es/subscr_single.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 95b1af43e..4c15877e3 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -27,6 +27,7 @@ * @author Oscar Ciudad <oscar@jacho.net> * @author Ruben Figols <ruben.figols@gmail.com> * @author Gerardo Zamudio <gerardo@gerardozamudio.net> + * @author Mercè López mercelz@gmail.com */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; diff --git a/inc/lang/es/subscr_single.txt b/inc/lang/es/subscr_single.txt index e2a54c79f..abddeeb21 100644 --- a/inc/lang/es/subscr_single.txt +++ b/inc/lang/es/subscr_single.txt @@ -1,7 +1,7 @@ Hola! La página @PAGE@ en @TITLE@ wiki ha cambiado. -Estos son los cambioss: +Estos son los cambios: -------------------------------------------------------- @DIFF@ @@ -9,7 +9,7 @@ Estos son los cambioss: Fecha : @DATE@ Usuario : @USER@ -Resúmen de edición: @SUMMARY@ +Resumen de edición: @SUMMARY@ Revisión Anterior: @OLDPAGE@ Nueva Revisión: @NEWPAGE@ |