Merge branch 'master' into 2.5.x

css/saiku/src/styles.css

@@ -876,7 +876,7 @@ span.clear_axis {
     height: 270px;
     width: 430px;
     font-size: 11px;
-    overflow: scroll;
+    overflow: auto;
 }
 .dialog_selections .options:before {
     clear:both;

js/saiku/plugins/I18n/po/es.json

@@ -1,64 +1,68 @@
 {
-   "New query":"Nueva consulta",
-   "Open query":"Abrir consulta",
-   "Save query":"Guardar consulta",
-   "Delete query":"Eliminar consulta",
-   "Logout":"Salir",
    "About":"Acerca de",
-   "Run query":"Ejecutar consulta",
-   "Toggle fields":"Alternar campos",
+   "Area":"Área",
    "Automatic execution":"Ejecución automática",
-   "Non-empty":"No vacio",
-   "Swap axis":"Intercambiar ejes",
-   "Show MDX":"Mostrar MDX",
-   "Export XLS":"Exportar XLS",
-   "Export CSV":"Exportar CSV",
-   "Drill Through":"",
+   "Bar 100%":"Barras 100%",
+   "Bar":"Barra",
+   "Basic Statistics":"Estadísticas básicas",
+   "Cancel":"Cancelar",
+   "Chart Type:  ":"Typo de gráfico:",
+   "Clear Axis":"Vaciar eje",
+   "Close Others":"Cerrar los demás",
+   "Close This":"Cerrar este",
+   "Columns":"Columnas",
    "Cubes":"Cubos",
+   "Delete query":"Eliminar consulta",
    "Dimensions":"Dimensiones",
-   "Measures":"Medidas",
-   "Rows":"Filas",
+   "Dot":"Punto",
+   "Drill through current query":"Taladrar a través de consulta activa",
+   "Drill through on cell":"Mostrar detalles de la celda",
+   "EXPERIMENTAL: Export  PDF":"EXPERIMENTAL: Exportar a PDF",
+   "EXPERIMENTAL: Export PDF":"EXPERIMENTAL: Exportar a PDF",
+   "Export CSV":"Exportar CSV",
+   "Export Drill-Through on cell to CSV":"Exportar detalles de la celda a CSV",
+   "Export XLS":"Exportar XLS",
+   "Export":"Exportar",
    "Filter":"Filtro",
-   "Columns":"Columnas",
+   "Heat Grid":"Cuadrícula activa",
+   "Hide Parents":"Ocultar Padres",
+   "Improve this translation":"Mejore  esta  traducción",
+   "Info:":"Información:",
    "Issue Tracker":"Seguimiento de incidencias",
-   "Toggle Chart":"Alternar Gráfica",
-   "Toggle sidebar":"Alternar de navegación",
-   "Drill through current query":"Taladrar a través de consulta activa",
-   "stacked bar":"de barras apiladas",
-   "bar":"de barras",
    "line":"de lineas",
-   "pie":"circular",
-   "Loading...":"Cargando...",
+   "Line":"Línea",
    "Loading datasources....":"Cargando  las fuentes de datos...",
-   "es":"es",
-   "Improve this translation":"Mejore  esta  traducción",
+   "Loading...":"Cargando...",
+   "Logout":"Salir",
+   "Measures":"Medidas",
+   "Mode:":"Modo",
+   "Multiple Bar Chart":"Gráficos múltiples de barras",
+   "New query":"Nueva consulta",
+   "New":"Nueva",
+   "Non-empty":"No vacio",
+   "Open query":"Abrir consulta",
    "Options:":"Opciones:",
-   "Basic Statistics":"Estadísticas básicas",
-   "Bar":"Barra",
-   "Stacked Bar":"Barras apiladas",
-   "Bar 100%":"Barras 100%",
-   "Line":"Línea",
-   "Area":"Área",
-   "Heat Grid":"Malla caliente",
-   "Dot":"Punto",
-   "Waterfall":"Cascada",
    "Pie":"Pastel",
-   "Hide Parents":"Ocultar Padres",
-   "Show Explain Plan":"Mostrar explicación del  plan",
-   "Query Scenario":"Escenario de consulta",
-   "Drill through on cell":"Profundizar sobre celda",
-   "Export Drill-Through on cell to CSV":"Exportar Profundizar sobre celda a CSV",
-   "EXPERIMENTAL: Export PDF":"EXPERIMENTAL: Exportar a PDF",
-   "Switch to MDX Mode":"Cambiar a modo  MDX",
-   "Chart Type:  ":"Typo de gráfico:",
    "Properties":"Propiedades",
-   "Refresh Cubes (Clear Cache)":"Refrescar cubos (Vaciar Cache)",
+   "Query Scenario":"Escenario de consulta",
+   "Refresh Cubes (Clear Cache)":"Refrescar Cubos (Vaciar Cache)",
+   "Rows":"Filas",
+   "Run query":"Ejecutar consulta",
+   "Running query...":"Ejecutando la consulta...",
+   "Save query":"Guardar consulta",
    "Select a cube":"Seleccionar un cubo",
+   "Show Explain Plan":"Mostrar explicación del  plan",
+   "Show MDX":"Mostrar MDX",
+   "Spark Bar":"Minigráfico de barras",
+   "Spark Line":"Minigráfico de líneas",
+   "Stacked Bar":"Barras apiladas",
+   "Swap axis":"Intercambiar ejes",
+   "Switch to MDX Mode":"Cambiar a modo  MDX",
    "Tags":"Etiquetas",
-   "You need to put at least one level or measure on Columns and Rows for a valid query.":"Debe almenos introducir un nivel o medidad en Columnas y Filas para una consulta válida",
-   "Running query...":"Ejecutando la consulta...",
-   "Info:":"Información:",
-   "EXPERIMENTAL: Export  PDF":"EXPERIMENTAL: Exportar a PDF",
-   "Refresh Cubes  (Clear Cache)":"Refrescar Cubos (Limpiar Cache)",
-   "Select a  cube":"Seleccionar cubo"
-}
+   "Toggle Chart":"Alternar Gráfica",
+   "Toggle fields":"Minimizar campos",
+   "Toggle sidebar":"Minimizar panel de navegación",
+   "Unsaved query":"Consulta sin guardar",
+   "Waterfall":"Cascada",
+   "You need to put at least one level or measure on Columns and Rows for a valid query.":"Debe al menos introducir un nivel o medida en Columnas y Filas para una consulta válida"
+}

js/saiku/views/QueryToolbar.js

@@ -115,6 +115,7 @@ var QueryToolbar = Backbone.View.extend({
             $(this.el).find('ul.chart').hide();
             $(this.el).find('ul.table').show();
             $(this.el).find('ul.table .stats').removeClass('on');
+            $(this.workspace.el).find('.workspace_results').children().hide();
             $(this.workspace.el).find('.workspace_results table').show();
             $(this.workspace.chart.el).hide().children().hide();
             this.render_mode = "table";