Patch Spanish language to fix redundant defines

Updated language_hr.h

Marlin/Version.h

@@ -35,7 +35,7 @@
   /**
    * Marlin release version identifier
    */
-  #define SHORT_BUILD_VERSION "1.1.0-RCBugFix"
+  #define SHORT_BUILD_VERSION "1.1.0-RC8"
 
   /**
    * Verbose version identifier which should contain a reference to the location

Marlin/language_es.h

@@ -53,7 +53,7 @@
 #define MSG_PREHEAT_1                       "Precalentar PLA"
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 "Todo"
-#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1"Plataforma"
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 "Plataforma"
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 "Config"
 #define MSG_PREHEAT_2                       "Precalentar ABS"
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
@@ -81,9 +81,9 @@
 #define MSG_FAN_SPEED                       "Ventilador"
 #define MSG_FLOW                            "Flujo"
 #define MSG_CONTROL                         "Control"
-#define MSG_MIN                             LCD_STR_THERMOMETER " Min"
-#define MSG_MAX                             LCD_STR_THERMOMETER " Max"
-#define MSG_FACTOR                          LCD_STR_THERMOMETER " Fact"
+#define MSG_MIN                             " " LCD_STR_THERMOMETER " Min"
+#define MSG_MAX                             " " LCD_STR_THERMOMETER " Max"
+#define MSG_FACTOR                          " " LCD_STR_THERMOMETER " Fact"
 #define MSG_AUTOTEMP                        "Temperatura Auto."
 #define MSG_ON                              "Encender"
 #define MSG_OFF                             "Apagar"
@@ -106,6 +106,10 @@
 #define MSG_YSTEPS                          "Y pasos/mm"
 #define MSG_ZSTEPS                          "Z pasos/mm"
 #define MSG_ESTEPS                          "E pasos/mm"
+#define MSG_E1STEPS                         "E1 pasos/mm"
+#define MSG_E2STEPS                         "E2 pasos/mm"
+#define MSG_E3STEPS                         "E3 pasos/mm"
+#define MSG_E4STEPS                         "E4 pasos/mm"
 #define MSG_TEMPERATURE                     "Temperatura"
 #define MSG_MOTION                          "Movimiento"
 #define MSG_VOLUMETRIC                      "Filamento"
@@ -174,16 +178,19 @@
 #define MSG_INFO_EXTRUDERS                  "Extrusores"
 #define MSG_INFO_BAUDRATE                   "Baudios"
 #define MSG_INFO_PROTOCOL                   "Protocolo"
-#define MSG_INFO_PRINT_COUNT                "Conteo de impresion"
-#define MSG_INFO_COMPLETED_PRINTS           "Completadas"
-#define MSG_INFO_PRINT_TIME                 "Tiempo total de imp."
-#define MSG_INFO_PRINT_LONGEST              "Impresion mas larga"
-#define MSG_INFO_PRINT_FILAMENT             "Total de Extrusion"
-#define MSG_INFO_PRINT_COUNT                "Impresiones"
-#define MSG_INFO_COMPLETED_PRINTS           "Completadas"
-#define MSG_INFO_PRINT_TIME                 "Total"
-#define MSG_INFO_PRINT_LONGEST              "Mas larga"
-#define MSG_INFO_PRINT_FILAMENT             "Extrusion"
+#if LCD_WIDTH > 19
+  #define MSG_INFO_PRINT_COUNT              "Conteo de impresion"
+  #define MSG_INFO_COMPLETED_PRINTS         "Completadas"
+  #define MSG_INFO_PRINT_TIME               "Tiempo total de imp."
+  #define MSG_INFO_PRINT_LONGEST            "Impresion mas larga"
+  #define MSG_INFO_PRINT_FILAMENT           "Total de Extrusion"
+#else
+  #define MSG_INFO_PRINT_COUNT              "Impresiones"
+  #define MSG_INFO_COMPLETED_PRINTS         "Completadas"
+  #define MSG_INFO_PRINT_TIME               "Total"
+  #define MSG_INFO_PRINT_LONGEST            "Mas larga"
+  #define MSG_INFO_PRINT_FILAMENT           "Extrusion"
+#endif
 #define MSG_INFO_MIN_TEMP                   "Temperatura minima"
 #define MSG_INFO_MAX_TEMP                   "Temperatura maxima"
 #define MSG_INFO_PSU                        "Fuente de poder"
@@ -200,13 +207,13 @@
 
 #if LCD_HEIGHT >= 4
   // Up to 3 lines allowed
-  #define MSG_FILAMENT_CHANGE_INIT_2          "del filamento"
-  #define MSG_FILAMENT_CHANGE_INIT_3          "cambiar"
-  #define MSG_FILAMENT_CHANGE_INSERT_3        "para continuar..."
+  #define MSG_FILAMENT_CHANGE_INIT_2        "del filamento"
+  #define MSG_FILAMENT_CHANGE_INIT_3        "cambiar"
+  #define MSG_FILAMENT_CHANGE_INSERT_3      "para continuar..."
 #else // LCD_HEIGHT < 4
   // Up to 2 lines allowed
-  #define MSG_FILAMENT_CHANGE_INIT_2          "del fil. cambiar"
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "Inserte filamento"
+  #define MSG_FILAMENT_CHANGE_INIT_2        "del fil. cambiar"
+  #define MSG_FILAMENT_CHANGE_INSERT_1      "Inserte filamento"
 #endif // LCD_HEIGHT < 4
 
 #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Esperado por"

README.md

@@ -1,14 +1,11 @@
 # Marlin 3D Printer Firmware
 
-[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
-
 <img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
 
 Additional documentation can be found at [The Marlin Documentation Project](https://www.marlinfw.org/).
 Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by!
 
-## Release Candidate -- Marlin 1.1.0-RCBugFix - 6 Dec 2016
+## Release Candidate -- Marlin 1.1.0-RC8 - 6 Dec 2016
 
 __Not for production use – use with caution!__
 
@@ -17,8 +14,6 @@ You can download earlier versions of Marlin on the [Releases page](https://githu
 The latest Release Candidate lives in the ["RC" branch](https://github.com/MarlinFirmware/Marlin/tree/RC). Bugs that we find in the current Release Candidate are patched in the ["RCBugFix" branch](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix), so during beta testing this is where you can always find the latest code on its way towards release.
 
 ## Recent Changes
-- RCBugFix
-
 - RC8 - 06 Dec 2016
   - Major performance improvement for Graphical LCDs
   - Simplified probe configuration
@@ -40,7 +35,7 @@ The latest Release Candidate lives in the ["RC" branch](https://github.com/Marli
   - Support for Printrbot Rev.F
   - New and updated languages
 
-- RC7 - 26 Jul 2016
+- RC7 - 31 Jul 2016
   - Add Print Job Timer and Print Counter (`PRINTCOUNTER`)
   - New `M600` Filament Change (`FILAMENT_CHANGE_FEATURE`)
   - New `G12` Nozzle Clean (`NOZZLE_CLEAN_FEATURE`)
@@ -106,7 +101,14 @@ Proposed patches should be submitted as a Pull Request against the [RCBugFix](ht
 - Do submit questions and concerns. The "naive" question is often the one we forget to ask.
 - Follow the proper coding style. Pull requests with styling errors will be delayed. See our [Coding Standards](https://github.com/MarlinFirmware/Marlin/wiki/DNE-Coding-Standards) page for more information.
 
-### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
+## Current Status: Testing
+
+Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by!
+
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
+[![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
+
+##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
 
 ## Credits
 
@@ -136,3 +138,5 @@ More features have been added by:
 Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
 
 While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
+
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)