Merge branch 'release-2.10.1'

oat-sa · Jan 2, 2018 · 64d7367 · 64d7367
2 parents a8a616e + c7d78fa
commit 64d7367
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/locales/it-IT/messages.lang.php b/locales/it-IT/messages.lang.php
@@ -251,6 +251,7 @@
 $GLOBALS['__l10n']["Manage users"]="Gestione utenti";
 $GLOBALS['__l10n']["Manage Versioned File"]="Gestisci le versioni del file";
 $GLOBALS['__l10n']["Map the properties to the CSV columns"]="Mappa le proprietà alle colonne CSV";
+$GLOBALS['__l10n']["Max upload speed"]="Massima velocita' di upload";
 $GLOBALS['__l10n']["Maximum bandwidth"]="Massima larghezza di banda";
 $GLOBALS['__l10n']["Maximum intensive bandwidth"]="Massimo della larghezza di banda";
 $GLOBALS['__l10n']["Maximum rendering time"]="Tempo massimo di esecuzione";
@@ -287,8 +288,8 @@
 $GLOBALS['__l10n']["No file selected"]="Nessun file selezionato";
 $GLOBALS['__l10n']["No files"]="Nessun file";
 $GLOBALS['__l10n']["no label"]="nessuna etichetta";
-$GLOBALS['__l10n']["No Preview available"]="Nessuna anteprima disponibile";
 $GLOBALS['__l10n']["No preview available"]="Nessuna anteprima disponibile";
+$GLOBALS['__l10n']["No Preview available"]="Nessuna anteprima disponibile";
 $GLOBALS['__l10n']["No results found"]="Nessun risultato trovato";
 $GLOBALS['__l10n']["Nothing imported"]="Nulla importato";
 $GLOBALS['__l10n']["Nothing to install !"]="Niente da installare!";
@@ -360,8 +361,8 @@
 $GLOBALS['__l10n']["Search %s"]="Cerca %s";
 $GLOBALS['__l10n']["Search sub-classes"]="Cerca sotto-classi";
 $GLOBALS['__l10n']["seconds"]="secondi";
-$GLOBALS['__l10n']["Select"]="Seleziona";
 $GLOBALS['__l10n']["select"]="seleziona";
+$GLOBALS['__l10n']["Select"]="Seleziona";
 $GLOBALS['__l10n']["Select a language"]="Scegli una lingua";
 $GLOBALS['__l10n']["Select the element destination"]="Scegli l'elemento di destinazione";
 $GLOBALS['__l10n']["Select this file"]="Seleziona questo file";

diff --git a/locales/it-IT/messages.po b/locales/it-IT/messages.po
@@ -155,7 +155,7 @@ msgid "Low upload speed"
 msgstr "Bassa velocita' di upload"
 
 msgid "Max upload speed"
-msgstr ""
+msgstr "Massima velocita' di upload"
 
 msgid "Maximum bandwidth"
 msgstr "Massima larghezza di banda"

diff --git a/locales/it-IT/messages_po.js b/locales/it-IT/messages_po.js
diff --git a/manifest.php b/manifest.php
@@ -29,7 +29,7 @@
     'label'       => 'Browser and OS diagnostic tool',
     'description' => 'Check compatibility of the os and browser of a client',
     'license'     => 'GPL-2.0',
-    'version'     => '2.10.0',
+    'version'     => '2.10.1',
     'author'      => 'Open Assessment Technologies SA',
     'requires'    => array(
         'tao'        => '>=14.3.1',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -574,6 +574,6 @@ public function update($initialVersion)
             $this->setVersion('2.9.0');
         }
 
-        $this->skip('2.9.0', '2.10.0');
+        $this->skip('2.9.0', '2.10.1');
     }
 }
diff --git a/views/js/controllers.min.js.map b/views/js/controllers.min.js.map